From: Gert Wollny Date: Tue, 1 Dec 2015 01:45:54 +0000 (+0100) Subject: Add debian directory X-Git-Tag: archive/raspbian/3.6.9-4+rpi1^2~326 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=2f44fe8f20d7d4947b0b039bd49b5ac0643e1fde;p=dcmtk.git Add debian directory --- diff --git a/debian/.directory b/debian/.directory new file mode 100644 index 00000000..8fa2f8fd --- /dev/null +++ b/debian/.directory @@ -0,0 +1,2 @@ +[URL properties] +ViewMode=fsview_part diff --git a/debian/NEWS.Debian b/debian/NEWS.Debian new file mode 100644 index 00000000..dcd7cab5 --- /dev/null +++ b/debian/NEWS.Debian @@ -0,0 +1,16 @@ +dcmtk (3.6.1~20150629-2) UNRELEASED; urgency=medium + + Version 3.6.1 has compatible change of the index.dat format that is not + backward compatible, and the current dcmtk is trashing the memory (one + byte of) when using dcmqrscp. All files in + + /var/lib/dcmtk/*/index.dat + + that are create with version 3.6.0 or before will be corrupted and + users need to reconstruct the db. + + The interested user might like to inspect the upstream commit + + http://git.dcmtk.org/web?p=dcmtk.git;a=commitdiff;h=c8423ab1fcf0273061462697b8eca56f894984c7 + + -- Andreas Tille Thu, 08 Oct 2015 13:06:03 +0200 diff --git a/debian/apache.conf b/debian/apache.conf new file mode 100644 index 00000000..39a5efa8 --- /dev/null +++ b/debian/apache.conf @@ -0,0 +1,9 @@ +# dcmtk default Apache configuration + +Alias /dcmtk_wlm /usr/share/dcmtk/www/ +ScriptAlias /dcmtk /usr/lib/dcmtk/cgi-bin/ + + + AllowOverride None + Options +ExecCGI + diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 00000000..8a7168d0 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,511 @@ +dcmtk (3.6.1~20150629-7) UNRELEASED; urgency=medium + + * d/control: Add more dependencies to libdcmtk-dev, because the + cmake based build system creates a cmake use file that pulls in + these libraries for linking. + + -- Gert Wollny Sun, 29 Nov 2015 21:10:54 +0100 + +dcmtk (3.6.1~20150629-6) unstable; urgency=medium + + * Change Provides:libdcmtk-dev to Provides:libdcmtk2-dev Closes: #805718 + + -- Gert Wollny Sat, 21 Nov 2015 13:58:54 +0100 + +dcmtk (3.6.1~20150629-5) unstable; urgency=medium + + * d/control: Add conflict/replace for libdcmtk4-dev + + -- Gert Wollny Thu, 12 Nov 2015 13:30:12 +0100 + +dcmtk (3.6.1~20150629-4) unstable; urgency=medium + + * Add patch soversion_abi.patch to change not only the library file + name but also in the cmake related files. + * Add patch dont_export.. to not export all executables for cmake + Closes: #803304 + * d/rules: remove code to add abi-suffix to libraries on install + * Add Gert Wollny to uploaders + + -- Gert Wollny Thu, 29 Oct 2015 11:51:54 +0100 + +dcmtk (3.6.1~20150629-3) unstable; urgency=medium + + * Adapt prerm script for dash + Closes: #803008 + * small DEP5 fixes + + -- Andreas Tille Mon, 26 Oct 2015 12:11:22 +0100 + +dcmtk (3.6.1~20150629-2) unstable; urgency=medium + + * debian/copyright: DEP5 + * unversioned -dev package + Closes: #800481 + * Inform users about non-backward compatible changes in dcmtk database + when using dcmqrscp + Closes: #799039 + * suppress lintian warnings no-symbols-control-file + * create empty dir /var/lib/dcmtk/db in package + Closes: #801735 + + -- Andreas Tille Fri, 23 Oct 2015 23:29:57 +0200 + +dcmtk (3.6.1~20150629-1) unstable; urgency=medium + + * New upstream version + * cme fix dpkg-control + * libdcmtk4-dev conflicts libdcmtk2-dev + Closes: #769151 + * Do gcc-5 transition on new version + * Conflicts/Replaces: libdcmtk3 + Closes: #754583 + * Do not hardcode path to invoke-rc.d in maintainer scripts + * Fix apache configuration (thanks for the patch to HAYASHI Kentaro + ) + Closes: #779700 + * Apply patch to fix performance problem (thanks for the patch to + Sebastien Jodogne ) + Closes: #785400) + * Enable reproducible build (Thanks for the patch to Maria Valentina Marin + ) + Closes: #790133 + + -- Andreas Tille Sun, 13 Sep 2015 20:31:57 +0200 + +dcmtk (3.6.1~20140617-3) experimental; urgency=low + + * Fix building/running on sparc. + * Really remove md5 files from doxygen HTML output + + -- Mathieu Malaterre Mon, 07 Jul 2014 09:09:49 +0200 + +dcmtk (3.6.1~20140617-2) experimental; urgency=low + + * Fix SIGSEGV on sparc + * Fix removal of md5 files on buildds + + -- Mathieu Malaterre Tue, 01 Jul 2014 11:15:54 +0200 + +dcmtk (3.6.1~20140617-1) experimental; urgency=low + + * New snapshot. Use ABI=4 as per upstream + * Refreshed patches, removed applied upstream + + -- Mathieu Malaterre Wed, 18 Jun 2014 08:44:51 +0200 + +dcmtk (3.6.1~20131114-7) experimental; urgency=low + + * Bump Std-Vers to 3.9.5, no changes needed + * Fix failing SCP test. Closes: #740342 + + -- Mathieu Malaterre Fri, 28 Feb 2014 13:19:20 +0100 + +dcmtk (3.6.1~20131114-6) experimental; urgency=low + + * Remove non-ASCII char. Closes: #732673 + * Fix setuid return value. Closes: #731434 + * Update old copyright. Closes: #732672 + + -- Mathieu Malaterre Thu, 27 Feb 2014 17:33:18 +0100 + +dcmtk (3.6.1~20131114-5) experimental; urgency=low + + * Increase timeout a little to fix issue on s390x + + d/p/timeout.patch + + -- Mathieu Malaterre Fri, 20 Dec 2013 11:02:48 +0100 + +dcmtk (3.6.1~20131114-4) experimental; urgency=low + + * Import patch from git (upstream) + + -- Mathieu Malaterre Thu, 19 Dec 2013 17:33:18 +0100 + +dcmtk (3.6.1~20131114-3) experimental; urgency=low + + * Another round of compilation fixes. Closes: #731434 + * Fix installation. Closes: #731752 + * Another attempt at fixing test. Closes: #730582 + + -- Mathieu Malaterre Tue, 10 Dec 2013 15:15:52 +0100 + +dcmtk (3.6.1~20131114-2) experimental; urgency=low + + * Fix failing test (ofstd_markup_6). Closes: #730582 + * Remove some spelling error in man pages. Closes: #730635 + * Remove CMake overriding our compilation flags. Closes: #730636 + + -- Mathieu Malaterre Thu, 05 Dec 2013 12:50:28 +0100 + +dcmtk (3.6.1~20131114-1) experimental; urgency=low + + * New snapshot. Closes: #723091, #715039 + * Refresh patches + + -- Mathieu Malaterre Fri, 22 Nov 2013 19:55:25 +0100 + +dcmtk (3.6.1~20121102-5) experimental; urgency=low + + * Fix jquery.js removal when executing build-indep + + -- Mathieu Malaterre Wed, 04 Sep 2013 09:08:29 +0200 + +dcmtk (3.6.1~20121102-4) experimental; urgency=low + + * Fix buffer overflow in StudyInstanceUID. Closes: #715011 + * Fix apache 2.4 transition. Closes: #669740 + * Fix -doc installation. Closes: #717968 + + -- Mathieu Malaterre Mon, 02 Sep 2013 11:13:46 +0200 + +dcmtk (3.6.1~20121102-3) experimental; urgency=low + + * fix lintian warning about jquery.js (doxygen generated) + * remove internal tests suite from dcmtk package + * cope with cmake and #701231 + * Update patch d/p/bug706062.patch. Closes: #706062 + * Upgrade for apache 2.4. Closes: #669740 + + -- Mathieu Malaterre Wed, 19 Jun 2013 13:51:22 +0200 + +dcmtk (3.6.1~20121102-2) experimental; urgency=low + + * Install *.dic to versioned dir (See #709123) + * Add preliminary work to get iconv support + + -- Mathieu Malaterre Fri, 31 May 2013 17:39:30 +0200 + +dcmtk (3.6.1~20121102-1) experimental; urgency=low + + * Use new dh syntax + * Run w-a-s. Use B-D-I for doxygen + * Switch to cmake build system (allows parallel builds). Closes: #701801 + * Use system CharLS. Closes: #705923 + * Use SOP class uid with option. Closes: #706062 + + -- Mathieu Malaterre Wed, 15 May 2013 10:34:58 +0200 + +dcmtk (3.6.0-13) unstable; urgency=low + + * Remove d/README.source, since source-format 3.0 + * Update dcmtk-www README for install instructions + * Remove obsolete DMUA flag + * Bump Std-Vers to 3.9.4, no changes needed + * Provide a debug package. Closes: #690733 + * Fix SIGSEGV. Closes: #703716 + + -- Mathieu Malaterre Wed, 15 May 2013 10:10:29 +0200 + +dcmtk (3.6.0-12) unstable; urgency=low + + [ Andrey Rahmatullin ] + * Fix underlinked libraries. Closes: #677721 + - debian/patches/underlink.patch + + -- Mathieu Malaterre Thu, 20 Dec 2012 13:20:45 +0100 + +dcmtk (3.6.0-11) unstable; urgency=low + + * Fix compilation with gcc 4.7. Closes: #674361 + - debian/patches/bug674361.patch + * Make sure to link against libxml2. Closes: #510120 + * Fix some underlinking. Closes: #674586 + - debian/patches/underlink.patch + + -- Mathieu Malaterre Thu, 31 May 2012 11:31:16 +0200 + +dcmtk (3.6.0-10) unstable; urgency=low + + [ Andreas Tille ] + * debian/dcmtk.prerm: when purging dirs in /var/lib need to be + removed in advance. Closes: #660346 + + [ Mathieu Malaterre ] + * Use libpng-dev. Closes: #662296 + * Use libtiff-dev for transition to tiff5 + * Bump Std-Vers to 3.9.3. No changes needed + + -- Mathieu Malaterre Tue, 06 Mar 2012 23:01:59 +0100 + +dcmtk (3.6.0-9) unstable; urgency=low + + * Remove dot wrapper, not required anymore. + * Generate doc using svg instead of png to save disk space + * Fix compilation. Thanks to Bhavani Shankar. Closes: #646316 + * Fix VCS URLs + + -- Mathieu Malaterre Wed, 23 Nov 2011 16:31:18 +0100 + +dcmtk (3.6.0-8) unstable; urgency=low + + * Adding a storescp daemon + * Remove convenient copy of CharLS. Closes: #631100 + + -- Mathieu Malaterre Tue, 19 Jul 2011 17:08:19 +0200 + +dcmtk (3.6.0-7) unstable; urgency=low + + * Add a patch (from current git/master) to fix a regression. Closes: #630781 + * Another fix to remove symlink only if exists + * Remove deprecated lintian override + + -- Mathieu Malaterre Fri, 17 Jun 2011 14:43:37 +0200 + +dcmtk (3.6.0-6) unstable; urgency=low + + * Make sure OFFIS_DCMTK_VERSION_NUMBER is really a number. Closes: #628168 + * Update Standard Version to 3.9.2. No changes needed + * Fix some lintian errors in control file + * Fix piuparts reports on remaining dcmtk apache configuration file + + -- Mathieu Malaterre Tue, 31 May 2011 23:28:12 +0200 + +dcmtk (3.6.0-5) unstable; urgency=low + + * Fix invalid dep. to apache with apache2 + * Remove explicit `invoke-rc.d dcmqrscp stop` since it makes package + un-removable. Let dh_installinit handles it + + -- Mathieu Malaterre Mon, 28 Mar 2011 15:33:06 +0200 + +dcmtk (3.6.0-4) unstable; urgency=low + + * new release fixes segfault. Closes: #615977 + * Update README. Closes: #618686 + * 3.6.0 is already packaged. Closes: #610855 + * Update postrm script. Closes: #618688 + + -- Mathieu Malaterre Thu, 17 Mar 2011 17:32:48 +0100 + +dcmtk (3.6.0-3) unstable; urgency=low + + * Properly conflict with dcmtk 3.5.4 and libdcmtk2 + * Remove reference to issue with UNIX FHS + + -- Mathieu Malaterre Tue, 08 Mar 2011 17:14:24 +0100 + +dcmtk (3.6.0-2) experimental; urgency=low + + * Update copyright to reflects 3.6.0 changes + * Update dcmtk.NEWS to reflects 3.6.0 news + * Minor update to dcmtk.README.Debian for build instructions + * Minor cosmetic changes to the patch series + + -- Mathieu Malaterre Tue, 08 Feb 2011 19:20:13 +0100 + +dcmtk (3.6.0-1) experimental; urgency=low + + [ Mathieu Malaterre ] + * New upstream: 3.6.0 + * Update SONAME to 2.0.0 because of change in log4cplus::Logger::addAppender + * Fix lintian errors on misc:Depends + * Fix lintian errors on init.d script + * Add a patch to link wth png/tiff libraries + * Update perl path patch + * debian/control: Update standards-version to 3.9.1 + * Fix new naming convention for this release + * Add get-orig-source target in rules file + * Fix CHANGES numbering into something more flexible for later revs. + * Move *.dic file to the libdcmtk2 package + * Switch to dpkg-source 3.0 (quilt) format + + [ Andreas Tille ] + * make sure *.dic file shwo up only in libdcmtk2 package + * Add -f to rm statement in clean target + + -- Andreas Tille Fri, 04 Feb 2011 22:24:40 +0100 + +dcmtk (3.5.4-4) unstable; urgency=low + + [Andreas Tille] + * Group maintenance according to Debian Med group policy + * Added myself as Uploader + * VCS fields + * Standards-Version: 3.8.3 (Added README.source) + * debhelper >= 7 + * Add passive mode to watch file + * make use of dh_install + * debian/patches/05_no_www_docs.patch: Just do not install those + files we do not need in the docs of the package in the first + place instead of removing them later + * Removed some lintian warnings + * debian/patches/06_old_patches_from_diff_gz.patch: Move changes + from diff.gz to quilt patches + * Remove unused config files from previous versions according to + http://wiki.debian.org/DpkgConffileHandling + (The former handling in preinst triggered a lintian error) + * debian/dcmtk.NEWS: Reformating according to developers reference + 6.3.4. Supplementing changelogs with NEWS.Debian files + * debian/{01_buildsystem_changes,01_fix_perl_script_path,02_dcmtk_3.5.4-3}.patch + split up patches of former maintainer into maintainable pieces + * Build-Depends: graphviz + * debian/dot: Hack to enable png:gd graphics in doxygen which was + told to be more compact and readable. The hack contains also + working code to create SVG, but I failed to patch the HTML files + to render SVG files + * debian/libdcmtk1.lintian-overrides: we bundle more than + one library in this package so the warning is void + * debian/rules: Try to make backups of original files in config + but failed for two remaining files (no idea why) + * Move all files of dcmtk-www to /usr/lib/dcmtk/cgi-bin and + provide apache configuration which enable easy access via + http://localhost/dcmtk_wlm/ + Closes: #553495 + + [Mathieu Malaterre] + * debian/rules would not honor DEB_BUILD_OPTIONS=nostrip, since + original Makefiles would hardcode call to `strip` directly + instead rely on dh_strip instead and remove direct call to + `strip` from Makefiles. + Closes: #511668, #436758 + + -- Andreas Tille Wed, 02 Dec 2009 09:54:56 +0100 + +dcmtk (3.5.4-3) unstable; urgency=low + + * debian/control: Update standards-version to 3.7.2 + * debian/dcmqrscp.init: Add LSB keyword section + * dcmnet/apps/{findscu,movescu}.cc: Apply patches in order + to fix --add-override-key bug (reported by Mike Miller + ) + Closes: #429041 + * debian/dcmtk.prerm: Stop dcmqrscp/imagectn more sanely + * debian/control: Replace ${Source-Version} by ${binary:Version} + + -- Juergen Salk Sun, 22 Jul 2007 20:41:22 +0200 + +dcmtk (3.5.4-2) unstable; urgency=low + + * debian/control: Added build dependency on autotools-dev + * debian/rules: Modified clean target to put config.{sub,guess} below ./config + * dcmdata/libsrc/Makefile.in: Modified distclean target to delete dicom.tmp as well + * debian/rules: Fixed installation path for include files + * debian/dcmtk.postinst: Fixed add{user,group} options to reveal possible error msgs + (reported by Lars Wirzenius ) + Closes: #353288 + * debian/control: Removed 'Uploaders: field. + | From: Pablo Sau + | Subject: Re: dcmtk + | Date: Thu, 19 Jan 2006 16:41:06 +0100 + | To: Juergen Salk + | Hi Juergen: + | > I am still keeping you as an active co-maintainer for the Debian + | > dcmtk packages in the debian/control file. Would you mind, if I + | > drop your name from the control file in one of the next releases? + | > + | Of course, you must do it! + | Thanks for your support of dcmtk and best regards. + | Pablo + + -- Juergen Salk Sun, 15 Jan 2006 17:31:38 +0000 + +dcmtk (3.5.4-1) unstable; urgency=low + + * New upstream release + * debian/dcmtk.NEWS: Added + * debian/copyright: Updated according to upstream's COPYRIGHT file + * debian/control: Unversioned build-dependency on libssl (now uses + OPENSSL_VERSION_NUMBER macro) + * debian/rules: Incremented SONAME version number (DcmFileFormat::loadFile changed) + * debian/rules: Changed dh_installinit --name argument to dcmqrscp + * debian/README.debian: Updated to reflect imagectn -> dcmqrscp transition + * debian/dcmtk.postinst: Added code for imagectn -> dcmqrscp transition + * debian/dcmtk.preinst: Created to handle imagectn -> dcmqrscp transition + * debian/dcmtk.postrm: Created to handle imagectn -> dcmqrscp transition + * debian/imagectn.init: Replaced by dcmqrscp.init + * debian/imagectn.default: Replaced by dcmqrscp.default + * debian/dcmtk.postinst: Added code to handle dcmtk user/group creation more sanely + * debian/control: Adjusted 'Maintainer:' field + * config/Makefile.def: Adjusted datadir and docdir + * dcmdata/libsrc/Makefile.in: Fixed bug for dicom.dic installation path + * dcmdata/apps/Makefile.in: Adjusted dcm2xml.dtd and dumppat.txt install paths + * dcmsr/apps/Makefile.in: Adjusted dsr2xml.xsd install path + * dcmwlm/perl/*.p[lh]: Adjusted perl hashbangs in CGI scripts + * dcmwlm/perl/prefs.ph: Adjusted cgi_path, html_path and data_path + * dcmqrdb/etc/dcmqrscp.cfg: Added UserName/GroupName config parameters + * dcmqrdb/etc/dcmqrscp.cfg: Commented out and adjusted example configuration + * dcmqrdb/docs/dcmqrcnf.txt: Adjusted UserName/GroupName examples + * dcmwlm/wlistdb/OFFIS: Added newline to prevent lintian "zero-bye" warning + + -- Juergen Salk Tue, 20 Dec 2005 20:29:15 +0000 + +dcmtk (3.5.3-5) unstable; urgency=low + + * ./dcmsign/libsrc/sicert.cc: Constified d2i_X509 argument to fix build + problems with libssl-0.9.8 + Closes: #335399 + * debian/control: Versioned build-depend on libssl (>= 0.9.8-1) + * ./dcmnet/etc/storescp.cfg: Added missing Verification SOP Class + + -- Juergen Salk Mon, 24 Oct 2005 20:16:56 +0000 + +dcmtk (3.5.3-4) unstable; urgency=low + + * debian/control: Added dependency on adduser for dcmtk package + * debian/control: Update Standards-Version to 3.6.2 + * debian/{control,rules}: Renamed libdcmtk0 to libdcmtk0c2 (gcc/g++-4.0 transition) + * debian/control: Added Conflicts/Replaces with previous non-c2 version + * config/{configure.in,aclocal.m4,include/cfunix.h.in}, + ofstd/libsrc/ofthread.cc: Backport HAVE_POINTER_TYPE_PTHREAD_T patch + from CVS version to fix build problems with gcc/g++-4.0 + + -- Juergen Salk Sun, 22 May 2005 22:02:31 +0200 + +dcmtk (3.5.3-3) unstable; urgency=low + + * debian/rules: Utilized binary-indep target for -doc package + (suggested by Marc 'HE' Brockschmidt ) + * debian/rules: Introduced {build,install}-{indep,arch} targets + * debian/rules: Removed unneeded dh_* calls from binary-arch target + * Removed stale debian/*.install files + + -- Juergen Salk Mon, 25 Apr 2005 20:13:09 +0200 + +dcmtk (3.5.3-2) unstable; urgency=medium + + * Added imagectn UserName/GroupName security patch + * Modified imagectn.cfg to reflect imagectn patch + * Modified debian/rules to create imagectn storage area + * Updated imagectn/docs/ctnconf.txt + * Fixed parser bug in CNF_readConfigLines() + (reported by R.M. Rutschmann ) + * Added debian/dcmtk.postinst script to create dcmtk system user/group + * Added debian/imagectn.init and debian/imagectn.default + (suggested by R.M. Rutschmann ) + * Updated debian/README.Debian + * Removed stale lintian override file + * Swapped 'Maintainer:' and 'Uploaders:' field + | From: Pablo Sau + | Subject: Re: New (inofficial) dcmtk packages available + | Date: Thu, 31 Mar 2005 16:44:50 +0200 + | > >> Why is Juergen "not official"? + | > > Historical reasons. It was Pablo who has filed the ITP for dcmtk + | > > initially. That's why we assigned maintainership to him for the + | > > first release. + | > If I understand Pablo right than he agreed that you will be put + | > in the Maintainer field. Pablo, correct me if I'm wrong. + | Yes of course,I filed the ITP for dcmtk initially but absolutely all + | work has been made by Juergen, so I think he must to be in the + | Maintainer field. + | Thanks Juergen for your great work and best regards to all of you. + + -- Juergen Salk Sat, 19 Mar 2005 22:58:21 +0100 + +dcmtk (3.5.3-1) unstable; urgency=low + + * Initial Release. + Closes: #278914 + * Adjusted toplevel Makefile and config/Makefile.def.in to fix $DESTDIR problems + * Fixed bug in config/configure.in for DCM_DICT_DEFAULT_PATH + * Modified dcmdata/libsrc/Makefile.in to adjust dicom.dic install path + * Modified dcmdata/apps/Makefile.in to adjust dcm2xml.dtd and dumppat.txt install paths + * Modified dcmsr/apps/Makefile.in to adjust dsr2xml.xsd install path + * Modified dcmwlm/Makefile.in to prevent wwwapps from being installed in ${bindir}. + * Set GENERATE_HTMLHELP = NO in doxygen/htmldocs to avoid index.hh?.gz cruft + * Adjusted hashbangs in dcmwlm/perl CGI scripts + * Adjusted cgi_path, html_path and data_path in dcmwlm/perl/prefs.ph + * Added newline in dcmwlm/wlistdb/OFFIS to prevent lintian "zero-bye" warning + + -- Juergen Salk Sat, 30 Oct 2004 11:02:48 +0200 + diff --git a/debian/compat b/debian/compat new file mode 100644 index 00000000..ec635144 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 00000000..5f68693a --- /dev/null +++ b/debian/control @@ -0,0 +1,131 @@ +Source: dcmtk +Maintainer: Debian Med Packaging Team +Uploaders: Juergen Salk , + Andreas Tille , + Mathieu Malaterre , + Gert Wollny +Section: science +Priority: optional +Build-Depends: cmake, + debhelper (>= 9), + libcharls-dev, + libpng-dev, + libsndfile1-dev, + libssl-dev, + libtiff-dev, + libwrap0-dev, + libxml2-dev, + gettext, + zlib1g-dev +Build-Depends-Indep: doxygen (>= 1.7.4), + graphviz +Standards-Version: 3.9.6 +Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/dcmtk/trunk +Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/dcmtk/trunk +Homepage: http://dicom.offis.de/dcmtk + +Package: dcmtk +Architecture: any +Depends: adduser, + ${misc:Depends}, + ${shlibs:Depends} +Description: OFFIS DICOM toolkit command line utilities + DCMTK includes a collection of libraries and applications for examining, + constructing and converting DICOM image files, handling offline media, + sending and receiving images over a network connection, as well as + demonstrative image storage and worklist servers. + . + This package contains the DCMTK utility applications. + . + Note: This version was compiled with libssl support. + +Package: libdcmtk5 +Architecture: any +Section: libs +Depends: ${misc:Depends}, + ${shlibs:Depends} +Conflicts: libdcmtk4,libdcmtk3 +Replaces: libdcmtk4,libdcmtk3 +Description: OFFIS DICOM toolkit runtime libraries + DCMTK includes a collection of libraries and applications for examining, + constructing and converting DICOM image files, handling offline media, + sending and receiving images over a network connection, as well as + demonstrative image storage and worklist servers. + . + This package contains the runtime libraries for the DCMTK utility + applications. + . + Note: This version was compiled with libssl support. + +Package: libdcmtk-dev +Architecture: any +Section: libdevel +Depends: libxml2-dev, + libssl-dev, + libpng-dev, + libwrap0-dev, + libtiff-dev, + libdcmtk5 (= ${binary:Version}), + ${misc:Depends} +Suggests: dcmtk-doc +Conflicts: libdcmtk2-dev, libdcmtk4-dev +Provides: libdcmtk2-dev +Replaces: libdcmtk2-dev, libdcmtk4-dev +Description: OFFIS DICOM toolkit development libraries and headers + DCMTK includes a collection of libraries and applications for examining, + constructing and converting DICOM image files, handling offline media, + sending and receiving images over a network connection, as well as + demonstrative image storage and worklist servers. + . + This package contains development libraries and headers for DCMTK. You + only need to install this if you are developing programs that use the + DCMTK libraries. + . + Note: This version was compiled with libssl support. + +Package: dcmtk-www +Architecture: any +Section: web +Depends: dcmtk, + ${misc:Depends}, + ${perl:Depends}, + ${shlibs:Depends} +Recommends: apache2 | httpd +Description: OFFIS DICOM toolkit worklist www server application + DCMTK includes a collection of libraries and applications for examining, + constructing and converting DICOM image files, handling offline media, + sending and receiving images over a network connection, as well as + demonstrative image storage and worklist servers. + . + This package contains the DICOM basic worklist management web server + application. You only need to install this if you want to manage worklist + entries using a web browser. + +Package: dcmtk-doc +Architecture: all +Section: doc +Depends: ${misc:Depends} +Suggests: dcmtk, + libdcmtk-dev +Description: OFFIS DICOM toolkit documentation + DCMTK includes a collection of libraries and applications for examining, + constructing and converting DICOM image files, handling offline media, + sending and receiving images over a network connection, as well as + demonstrative image storage and worklist servers. + . + This package contains the on-line documentation for the DCMTK libraries + and utilities in HTML format. + +Package: libdcmtk5-dbg +Architecture: any +Section: debug +Priority: extra +Depends: libdcmtk5 (= ${binary:Version}), + ${misc:Depends} +Description: OFFIS DICOM toolkit library debugging symbols + DCMTK includes a collection of libraries and applications for examining, + constructing and converting DICOM image files, handling offline media, + sending and receiving images over a network connection, as well as + demonstrative image storage and worklist servers. + . + This package contains the debugging symbols for libdcmtk4v5. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 00000000..3093f443 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,277 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: DCMTK +Upstream-Contact: DCMTK Team +Source: https://github.com/commontk/DCMTK + +Files: * +Copyright: 1994-2015, OFFIS e.V. +License: OFFISeV + +License: OFFISeV + This software and supporting documentation were developed by + . + OFFIS e.V. + R&D Division Health + Escherweg 2 + 26121 Oldenburg, Germany + . + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + - Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + - Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + - Neither the name of OFFIS nor the names of its contributors may be + used to endorse or promote products derived from this software + without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Files: dcmnet/include/dcmtk/dcmnet/dimse.h + dcmnet/include/dcmtk/dcmnet/assoc.h + dcmnet/include/dcmtk/dcmnet/dicom.h + dcmnet/include/dcmtk/dcmnet/dcompat.h + dcmnet/include/dcmtk/dcmnet/diutil.h + dcmnet/libsrc/dimstore.cc + dcmnet/libsrc/assoc.cc + dcmnet/libsrc/dulextra.cc + dcmnet/libsrc/dcompat.cc + dcmnet/libsrc/diutil.cc + dcmnet/libsrc/dimcmd.h + dcmnet/libsrc/dimfind.cc + dcmnet/libsrc/dimse.cc + dcmnet/libsrc/dimcmd.cc + dcmnet/libsrc/dimcancl.cc + dcmnet/libsrc/dimecho.cc + dcmnet/libsrc/dimmove.cc +Copyright: 1993/1994, OFFIS, Oldenburg University and CERIUM +License: OFFIS + This software and supporting documentation were + developed by + . + Institut OFFIS + Bereich Kommunikationssysteme + Westerstr. 10-12 + 26121 Oldenburg, Germany + . + Fachbereich Informatik + Abteilung Prozessinformatik + Carl von Ossietzky Universitaet Oldenburg + Ammerlaender Heerstr. 114-118 + 26111 Oldenburg, Germany + . + CERIUM + Laboratoire SIM + Faculte de Medecine + 2 Avenue du Pr. Leon Bernard + 35043 Rennes Cedex, France + . + for CEN/TC251/WG4 as a contribution to the Radiological + Society of North America (RSNA) 1993 Digital Imaging and + Communications in Medicine (DICOM) Demonstration. + . + THIS SOFTWARE IS MADE AVAILABLE, AS IS, AND NEITHER OFFIS, + OLDENBURG UNIVERSITY NOR CERIUM MAKE ANY WARRANTY REGARDING + THE SOFTWARE, ITS PERFORMANCE, ITS MERCHANTABILITY OR + FITNESS FOR ANY PARTICULAR USE, FREEDOM FROM ANY COMPUTER + DISEASES OR ITS CONFORMITY TO ANY SPECIFICATION. THE + ENTIRE RISK AS TO QUALITY AND PERFORMANCE OF THE SOFTWARE + IS WITH THE USER. + . + Copyright of the software and supporting documentation + is, unless otherwise stated, jointly owned by OFFIS, + Oldenburg University and CERIUM and free access is hereby + granted as a license to use this software, copy this + software and prepare derivative works based upon this + software. However, any distribution of this software + source code or supporting documentation or derivative + works (source code and supporting documentation) must + include the three paragraphs of this copyright notice. + +Files: dcmnet/include/dcmtk/dcmnet/dul.h + dcmnet/include/dcmtk/dcmnet/dul.h + dcmnet/libsrc/dulstruc.h + dcmnet/libsrc/dulstruc.h + dcmnet/libsrc/dul.cc + dcmnet/libsrc/dul.cc + dcmnet/libsrc/dulconst.cc + dcmnet/libsrc/dulconst.cc + dcmnet/libsrc/dulpriv.h + dcmnet/libsrc/dulpriv.h + dcmnet/libsrc/dulpres.cc + dcmnet/libsrc/dulpres.cc + dcmnet/libsrc/dulfsm.h + dcmnet/libsrc/dulfsm.h + dcmnet/libsrc/dulfsm.cc + dcmnet/libsrc/dulfsm.cc + dcmnet/libsrc/dulparse.cc + dcmnet/libsrc/dulparse.cc +Copyright: 1993, RSNA and Washington University +License: RSNA + The software and supporting documentation for the Radiological + Society of North America (RSNA) 1993 Digital Imaging and + Communications in Medicine (DICOM) Demonstration were developed + at the + Electronic Radiology Laboratory + Mallinckrodt Institute of Radiology + Washington University School of Medicine + 510 S. Kingshighway Blvd. + St. Louis, MO 63110 + as part of the 1993 DICOM Central Test Node project for, and + under contract with, the Radiological Society of North America. + . + THIS SOFTWARE IS MADE AVAILABLE, AS IS, AND NEITHER RSNA NOR + WASHINGTON UNIVERSITY MAKE ANY WARRANTY ABOUT THE SOFTWARE, ITS + PERFORMANCE, ITS MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR + USE, FREEDOM FROM ANY COMPUTER DISEASES OR ITS CONFORMITY TO ANY + SPECIFICATION. THE ENTIRE RISK AS TO QUALITY AND PERFORMANCE OF + THE SOFTWARE IS WITH THE USER. + . + Copyright of the software and supporting documentation is + jointly owned by RSNA and Washington University, and free access + is hereby granted as a license to use this software, copy this + software and prepare derivative works based upon this software. + However, any distribution of this software source code or + supporting documentation or derivative works (source code and + supporting documentation) must include the three paragraphs of + the copyright notice. + +Files: dcmjpeg/libijg8/* + dcmjpeg/libijg12/* + dcmjpeg/libijg16/* +Copyright: 1991-1998, Thomas G. Lane. +License: JPEG + The authors make NO WARRANTY or representation, either express or implied, + with respect to this software, its quality, accuracy, merchantability, or + fitness for a particular purpose. This software is provided "AS IS", and you, + its user, assume the entire risk as to its quality and accuracy. + . + Permission is hereby granted to use, copy, modify, and distribute this + software (or portions thereof) for any purpose, without fee, subject to these + conditions: + (1) If any part of the source code for this software is distributed, then this + README file must be included, with this copyright and no-warranty notice + unaltered; and any additions, deletions, or changes to the original files + must be clearly indicated in accompanying documentation. + (2) If only executable code is distributed, then the accompanying + documentation must state that "this software is based in part on the work of + the Independent JPEG Group". + (3) Permission for use of this software is granted only if the user accepts + full responsibility for any undesirable consequences; the authors accept + NO LIABILITY for damages of any kind. + . + These conditions apply to any software derived from or based on the IJG code, + not just to the unmodified library. If you use our work, you ought to + acknowledge us. + . + Permission is NOT granted for the use of any IJG author's name or company name + in advertising or publicity relating to this software or products derived from + it. This software may be referred to only as "the Independent JPEG Group's + software". + . + We specifically permit and encourage the use of this software as the basis of + commercial products, provided that all warranty or liability claims are + assumed by the product vendor. + +Files: dcmimage/include/dcmtk/dcmimage/diqtpix.h +Copyright: 1991 by Jef Poskanzer. +License: pbmplus + Permission to use, copy, modify, and distribute this software and its + documentation for any purpose and without fee is hereby granted, provided + that the above copyright notice appear in all copies and that both that + copyright notice and this permission notice appear in supporting + documentation. This software is provided "as is" without express or + implied warranty. +Comment: The code for the interpolatePixel() image scaling algorithm in module + dcmimgle has been derived from code written by Jef Poskanzer for the + "Extended Portable Bitmap Toolkit" (pbmplus10dec91) + +Files: ofstd/libsrc/ofstd.cc +Copyright: 2001-2015 OFFIS e.V. + 1998 Todd C. Miller +License: OFFISeV + +Files: oflog/* +Copyright: 1999-2009 Contributors to log4cplus project. +License: BSD-2-clause + Redistribution and use in source and binary forms, with or without modifica- + tion, are permitted provided that the following conditions are met: + . + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + . + 2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + . + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU- + DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +Files: oflog/include/dcmtk/oflog/appender.h +Copyright: 2001-2009 Tad E. Smith +License: Apache-1.0 + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + . + http://www.apache.org/licenses/LICENSE-2.0 + . + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +Files: dcmjpls/libcharls/* +Copyright: 2007-2010, Jan de Vaan +License: BSD-3-clause + +Files: debian/* +Copyright: 2005-2011 Juergen Salk on + 2011-2014 Mathieu Malaterre + 2014-2015 Andreas Tille +License: BSD-3-clause + +License: BSD-3-clause + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. The name of the author may not be used to endorse or promote products + derived from this software without specific prior written permission. + * + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY + AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; + OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/debian/dcmqrscp.default b/debian/dcmqrscp.default new file mode 100644 index 00000000..03a66998 --- /dev/null +++ b/debian/dcmqrscp.default @@ -0,0 +1,3 @@ +# Run dcmqrscp at startup ? +DCMQRSCP_ENABLE=No + diff --git a/debian/dcmqrscp.init b/debian/dcmqrscp.init new file mode 100644 index 00000000..c7a08164 --- /dev/null +++ b/debian/dcmqrscp.init @@ -0,0 +1,89 @@ +#! /bin/sh +# +# Start script for dcmqrscp from dcmtk-package +# Adapted from skeleton +# @(#)skeleton 2.85-23 28-Jul-2004 miquels@cistron.nl +# by Roland Marcus Rutschmann +# and Juergen Salk +# Version 0.2 Sun, 22 Jul 2007 21:32:42 +0200 +### BEGIN INIT INFO +# Provides: dcmqrscp +# Required-Start: $network $local_fs $remote_fs +# Required-Stop: $network $local_fs $remote_fs +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Init-Script for DCMTK Central Test Node dcmqrscp +### END INIT INFO + + +set -e + +PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin +DESC="DCMTK Central Test Node" +NAME=dcmqrscp +DAEMON=/usr/bin/$NAME +PIDFILE=/var/run/$NAME.pid +SCRIPTNAME=/etc/init.d/$NAME +DCMQRSCP_CFG="/etc/dcmtk/dcmqrscp.cfg" + +# Gracefully exit if the package has been removed. +test -x $DAEMON || exit 0 + +# Read config file if it is present. +if [ -r /etc/default/$NAME ] +then + . /etc/default/$NAME +fi + +case "$DCMQRSCP_ENABLE" in + [Nn]*) + exit 0 + ;; +esac + + +# +# Function that starts the daemon/service. +# +d_start() { + start-stop-daemon --start --quiet --background \ + --make-pidfile --pidfile $PIDFILE \ + --exec $DAEMON -- +ac -c $DCMQRSCP_CFG +} + +# +# Function that stops the daemon/service. +# +d_stop() { + start-stop-daemon --stop --quiet --pidfile $PIDFILE \ + --name $NAME +} + +case "$1" in + start) + echo -n "Starting $DESC: $NAME" + d_start + echo "." + ;; + stop) + echo -n "Stopping $DESC: $NAME" + d_stop + echo "." + ;; + reload) + exit 0 + ;; + restart|force-reload) + echo -n "Restarting $DESC: $NAME" + d_stop + sleep 1 + d_start + echo "." + ;; + *) + echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 diff --git a/debian/dcmtk-doc.doc-base b/debian/dcmtk-doc.doc-base new file mode 100644 index 00000000..1d83dc93 --- /dev/null +++ b/debian/dcmtk-doc.doc-base @@ -0,0 +1,12 @@ +Document: dcmtk-doc +Title: Documentation of DCMTK +Author: OFFIS DICOM Team +Abstract: This manual comprises the complete on-line documentation for the + DICOM ToolKit (DCMTK) packages. It covers the end user applications as well + as the development library interfaces including a wide variety of coding + examples. +Section: Science/Medicine + +Format: HTML +Index: /usr/share/doc/dcmtk-doc/html/index.html +Files: /usr/share/doc/dcmtk-doc/html/* diff --git a/debian/dcmtk-doc.docs b/debian/dcmtk-doc.docs new file mode 100644 index 00000000..1c648599 --- /dev/null +++ b/debian/dcmtk-doc.docs @@ -0,0 +1 @@ +debian/tmp/usr/share/doc/dcmtk/html diff --git a/debian/dcmtk-www.README.Debian b/debian/dcmtk-www.README.Debian new file mode 100644 index 00000000..bd1bf261 --- /dev/null +++ b/debian/dcmtk-www.README.Debian @@ -0,0 +1,13 @@ +Web interface for the OFFIS DICOM ToolKit in Debian +=================================================== + +Please make sure you read the file wwwapp.txt in this directory. + +Hint: Apache is configured in this way that you can either + point your browser to + + http://localhost/cgi-bin/dcmtk_wlm/main.pl + + or + + http://localhost/dcmtk_wlm/main.pl diff --git a/debian/dcmtk-www.dirs b/debian/dcmtk-www.dirs new file mode 100644 index 00000000..fcd24898 --- /dev/null +++ b/debian/dcmtk-www.dirs @@ -0,0 +1 @@ +/etc/apache2/conf-available diff --git a/debian/dcmtk-www.docs b/debian/dcmtk-www.docs new file mode 100644 index 00000000..a20f6ea7 --- /dev/null +++ b/debian/dcmtk-www.docs @@ -0,0 +1 @@ +dcmwlm/docs/wwwapp.txt diff --git a/debian/dcmtk-www.install b/debian/dcmtk-www.install new file mode 100644 index 00000000..3bd6cba0 --- /dev/null +++ b/debian/dcmtk-www.install @@ -0,0 +1,7 @@ +dcmwlm/images/* usr/share/dcmtk/www +dcmwlm/perl/* usr/lib/dcmtk/cgi-bin +debian/apache.conf etc/dcmtk +usr/bin/preplock usr/lib/dcmtk/cgi-bin +usr/bin/readoviw usr/lib/dcmtk/cgi-bin +usr/bin/readwlst usr/lib/dcmtk/cgi-bin +usr/bin/writwlst usr/lib/dcmtk/cgi-bin diff --git a/debian/dcmtk-www.links b/debian/dcmtk-www.links new file mode 100644 index 00000000..9343367f --- /dev/null +++ b/debian/dcmtk-www.links @@ -0,0 +1 @@ +usr/lib/dcmtk/cgi-bin usr/lib/cgi-bin/dcmtk_wlm diff --git a/debian/dcmtk-www.postinst b/debian/dcmtk-www.postinst new file mode 100644 index 00000000..1c1438aa --- /dev/null +++ b/debian/dcmtk-www.postinst @@ -0,0 +1,40 @@ +#!/bin/sh -e +# postinst script for dcmtk-www + +pkg=dcmtk + +apache_install() { + webserver=apache2 + if [ -d /etc/$webserver/conf-available ] && [ ! -e /etc/$webserver/conf-available/${pkg}.conf ]; then + ln -s ../../${pkg}/apache.conf /etc/$webserver/conf-available/${pkg}.conf + # Restart webserver to register configuration for dcmtk if config is considered to be OK + if ${webserver}ctl configtest 2>/dev/null; then + if which invoke-rc.d ; then + invoke-rc.d $webserver reload 3>/dev/null || true + else + /etc/init.d/$webserver reload 3>/dev/null || true + fi + else + echo "Your $webserver configuration is broken, so we're not restarting it for you." + fi + + fi +} + +case "$1" in + configure) + apache_install + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 diff --git a/debian/dcmtk-www.postrm b/debian/dcmtk-www.postrm new file mode 100644 index 00000000..0db3f287 --- /dev/null +++ b/debian/dcmtk-www.postrm @@ -0,0 +1,38 @@ +#!/bin/sh +# postrm script for dcmtk-www + +set -e + +pkg=dcmtk + +case "$1" in + purge|remove|upgrade) + # Restart Apache to register configuration for dcmtk + if [ "$1" = "purge" ] ; then + if [ -L /etc/apache2/conf-available/${pkg}.conf ] ; then + rm -f /etc/apache2/conf-available/${pkg}.conf + fi + fi + if apache2ctl configtest 2>/dev/null; then + if which invoke-rc.d ; then + invoke-rc.d apache2 reload 3>/dev/null || true + else + /etc/init.d/apache2 reload 3>/dev/null || true + fi + else + echo "Your apache2 configuration is broken, so we're not restarting it for you." + fi + ;; + + failed-upgrade|abort-install|abort-upgrade|disappear) + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 diff --git a/debian/dcmtk.NEWS b/debian/dcmtk.NEWS new file mode 100644 index 00000000..02975c66 --- /dev/null +++ b/debian/dcmtk.NEWS @@ -0,0 +1,137 @@ +dcmtk (3.6.0-1) unstable; urgency=low + + Version 3.6.0 of the OFFIS DCMTK (DICOM ToolKit) software is now available for + public release. This release includes the following main changes over the + previous version 3.5.4: + + - DCMTK 3.6.0 now also builds correctly with GNU gcc 4.1 (and higher), Visual + Studio 2008 and 2010. + + - Tested with latest versions of the following operating systems/environments: + + - Linux on x86 and x86_64 + - FreeBSD on x86 and x86_64 + - MacOS X on x86_64 + - Windows on x86 and x86_64 + - Cygwin and MinGW/MSys on x86 + + For a complete list of tested systems and compilers, see the INSTALL file. + + - The CMake build system can now also be used with other operating systems than + Windows. However, GNU autoconf is still supported and should be preferred on + systems where the CMake project files fail. + + - New module oflog introduces a unified DCMTK-wide approach for logging based + on the log4cplus library. Direct output to console, file, syslog and event + log. All DCMTK command line tools now have the same set of logging options. + + - New module dcmjpls adds support for JPEG-LS compressed DICOM images based on + the CharLS library. The tools dcmcjpls and dcmdjpls allow for compressing + and decompressing DICOM images with JPEG-LS from the command line. + + - New tool img2dcm allows for converting JPEG and BMP images to various DICOM + image IODs, e.g. old and new Secondary Capture, Visible Light Photographic. + The underlying C++ class library can also be used separately. + + - New tool dcm2pdf allows for extracting PDF files from DICOM Encapsulated PDF + Storage SOP instances. + + - New tool dcml2pnm allows for converting JPEG-LS compressed DICOM images to + standard image formats like TIFF or BMP. + + - The tools dcmdump and storescu have new options for searching directories + recursively for DICOM files. + + - The tool dcmdump now also has a colored output of the textual dump. So far, + this option is available on non-Windows systems only (uses ANSI escape code). + + - The tool dcmodify now also supports reading the value of insert and modify + statements from a file. This is especially useful for large element values. + + - The tool dsr2html now also supports the output in HTML 4.01 and XHTML 1.1 + format. There are also new options that affect the rendering result. + + - The tool dump2dcm now also supports compressed pixel data. In addition, + the memory requirements for very large data elements have been reduced. + + - The tool xml2dcm can now also read binary data (e.g. pixel data) from a + separate file. The corresponding feature is not yet available in dcm2xml. + + - The tool storescp now has a new option that allows for accepting all + supported transfer syntaxes on a single association. + + - The tool wlmscpfs now supports multi-process mode both on Posix and Windows + platforms where a new child process is created for each incoming association. + + - Refactored code of the tool findscu into a C++ class. This facilitates + re-use of the findscu code in other applications. + + - Added further "switches" to the dcmdata module which allow one to better cope + with incorrectly encoded DICOM files or datasets. These switches are also + available as new options to the tools dcmdump and dcmconv. + + - The dcmdata module now also gives access to partial attribute values without + loading the complete attribute value into memory, if kept in file. + + - The write methods in dcmdata now handle large raw data elements without + loading everything into memory. This allows very large images to be sent + over a network connection or to be copied without ever being fully in memory. + + - The dcmdata module now has a common interface for the frame-wise access to + compressed and uncompressed pixel data without ever loading the complete + object into main memory. + + - The dcmimgle/dcmimage module makes use of the new partial access to pixel + data for processing large multi-frame images in a stepwise manner. + + - The dcmimgle/dcmimage module and related tools now also support a new + bilinear and a bicubic scaling algorithm for image magnification. + Furthermore, the sigmoid VOI LUT function has been implemented. + + - Added support for Colon CAD SR, Spectacle Prescription Report, Macular Grid + Thickness and Volume Report as well as Implantation Plan SR documents to the + dcmsr module. + + - Incorporated fixes to dcmsr module which were introduced by various + correction proposals. Added support for the new optional Preliminary Flag. + + - DICOMDIR tools and classes now support all new SOP classes and directory + record types. Also added a new operating mode that allows for updating + existing entries in a DICOMDIR. + + - Introduced general path syntax for accessing nested elements from command + line tools like findscu or dcmodify. + + - Added methods for checking the value representation (VR) and value + multiplicity (VM) of data elements for conformance with the DICOM standard. + + - Network tools now support transmission and receipt of JPEG-LS and MPEG2 + transfer syntaxes. + + - Added support for the extended negotiation of user identity to the dcmnet + module. The first tool that makes use of this new feature is storescu. + + - Introduced new experimental SCU and SCP classes that act as a C++ wrapper to + the still C-based dcmnet module. + + - Added new class OFFile that provides a simple encapsulation layer for file + based stream I/O and, in particular, provides large file support (LFS) if + available on the underlying operating system/platform through a single API. + + - Out of the box compilation with OpenSSL 1.0.0 is now supported. + + - Revised installation directory scheme in order to be more compliant with the + Filesystem Hierarchy Standard (FHS) and derived file system standards. + + - Added data dictionary including private ASTM tags from DICONDE (Digital + Imaging and Communication in Nondestructive Evaluation) standard. + + - The DICOM data dictionary as well as the list of SOP classes and transfer + syntaxes have been re-worked based on the latest edition of the DICOM + standard plus all additionally approved supplements and correction proposals + (as of 2010-11-30). Please note that there have been minor name changes! + + - Many bug fixes and minor improvements as usual - see the more than 12,000 + lines long CHANGES.360 file for more details. + + -- Mathieu Malaterre Tue, 08 Feb 2011 19:14:53 +0100 diff --git a/debian/dcmtk.README.Debian b/debian/dcmtk.README.Debian new file mode 100644 index 00000000..879fe537 --- /dev/null +++ b/debian/dcmtk.README.Debian @@ -0,0 +1,150 @@ +DCMTK - The OFFIS DICOM ToolKit for Debian +========================================== + +General notes: + +DCMTK is a collection of libraries and applications implementing large +parts the DICOM standard. It includes software for examining, +constructing and converting DICOM image files, handling offline media, +sending and receiving images over a network connection, as well as +demonstrative image storage and worklist servers. DCMTK is is written +in a mixture of ANSI C and C++. It comes in complete source code and +is made available as "open source" software under BSD like license +terms. For additional information about DCMTK have a look at the +OFFIS web page: + + http://dicom.offis.de/dcmtk.php.en + +DCMTK has been used at numerous DICOM demonstrations to provide +central, vendor-independent image storage and worklist servers (CTNs - +Central Test Nodes). It is used by hospitals and companies all over +the world for a wide variety of purposes ranging from being a tool for +product testing to being a building block for research projects, +prototypes and commercial products. + +DCMTK optionally supports some of the DICOM security extensions and +relies on the free OpenSSL toolkit for the underlying cryptographic +routines and the TLS protocol implementation. The Debian DCMTK package +has been built with OpenSSL support enabled. + +More information about using the DCMTK network applications for secure +DICOM communication can be found in + + /usr/share/docs/dcmtk/ciphers.txt + /usr/share/docs/dcmtk/randseed.txt + +DCMTK optionally supports Wietse Venema's TCP wrappers library +(libwrap) which is freely available for most Unix platforms and part +of the default installation of most recent Linux distributions. This +library allows one to enforce host-based access control via the +"/etc/hosts_deny" and "/etc/hosts_allow" configuration files. The +Debian DCMTK package has been compiled with TCP wrapper support +enabled. See hosts_access(5) man page for details. + +You can use the dcmnet applications for testing DICOM connectivity. A +brief description can be found in + + /usr/share/docs/dcmtk/testing.txt + + +The DCMTK dcmqrscp application implements a DICOM image +storage/query/retrieve SCP which has been designed primarily as an +independent framework for cooperative tests and demonstrations of +DICOM connectivity by medical imaging vendors. If you want to set up +dcmqrdb as a DICOM image storage server please read both the dcmqrscp +manual pages and the supplemental documentation in + + /usr/share/doc/dcmtk/dcmqrcnf.txt + /usr/share/doc/dcmtk/dcmqrset.txt + +The dcmqrscp application can be invoked as a daemon process at boot +time by setting DCMQRSCP_ENABLE=Yes in /etc/defaults/dcmqrscp. You will +have to adjust the system wide configuration file +/etc/dcmtk/dcmqrscp.cfg to suit your needs. This configuration file +provides optional UserName/GroupName keywords in the "Global +Parameter" section (see note in dcmqrcnf.txt). Running dcmqrscp with +root privileges is strongly discouraged. A dedicated system +user/group dcmtk/dcmtk is automatically added during the installation +of the Debian DCMTK package. It is important to note that dcmqrscp is +primarily intended to be used as a demonstration server rather than a +real "PACS replacement". Scalability is quite limited, both in terms +of number of images/studies and in number of parallel clients. If you +want to set up a real large database, you might be better off in using +an SQL based archive (such as the Mallinckrodt CTN). + + +DCMTK supports the Modality Worklist Management SOP Class as a SCP, which +allows modalities to query and retrieve worklist information from hospital +information systems. An example worklist database along with a set of +example queries can be found in + + /usr/share/doc/dcmtk/examples/wlistdb + +and + + /usr/share/doc/dcmtk/examples/wlistqry. + +Here is a brief instruction about how to make this work (based on a post +of Thomas Wilkens in comp.protocols.dicom): + +1. Use dump2dcm to convert all "*.dump" files in examples/wlistdb/OFFIS +to "*.wl" files (DICOM format): + + $ for f in *.dump; do dump2dcm "$f" "${f%.dump}".wl; done + +Note that these files have to have the extension "*.wl", otherwise wlmscpfs +will not find these files. These files represent your worklist database. +2. Use dump2dcm to convert all "*.dump" files in examples/wlistqry to +"*.dcm" files (DICOM format): + + $ for f in *.dump; do dump2dcm "$f" "${f%.dump}".dcm; done + +These files represent possible queries that can be used to query the worklist +database. +3. In one shell run the following command to start the worklist management SCP: + + $ wlmscpfs -v -dfp examples/wlistdb 1234 + +4. In another shell run the following command to send a certain query to the +WLM SCP: + + $ findscu -v --call OFFIS localhost 1234 examples/wlistqry/wlistqry0.dcm + +Step 3 will start the worklist management SCP which will listen on port 1234 +for incoming C-FIND RQ messages. The "-dfp examples/wlistdb" option +specifies that the worklist database can be found in folder "examples/wlistdb". +Note that the worklist database can be organized in different storage areas. +Subfolder "OFFIS" below "examples/wlistdb" is one (the only one in this case) +storage area. In an incoming C-FIND RQ, an SCU has to tell wlmscpfs which +storage area shall be queried; this is done by sending a certain "called AE title" +to wlmscpfs. + +Step 4 will send the query in file "examples/wlistqry/wlistqry0.dcm" +using a C-FIND-RQ message to the wlmscpfs application (which is running on +"localhost" and listening on port "1234"). Option "--call OFFIS" specifies +that the called AE title is "OFFIS" which in turn tells the wlmscpfs +application to query the storage area "OFFIS" in its worklist database. + +The two programs should then dump information that shows their internal +processings (C-FIND RQ - C-FIND RSP). You can also use a different query +file in folder "examples/wlistqry" for querying the worklist database. + +As the wlmscpfs is not a hospital information system, worklist entries +must be created, updated and deleted manually. The Debian dcmtk-www +package contains a cgi-based WWW server application which provides an easy +to use web interface for managing worklist entries from any workstation +in the network. More information about the DCMTK worklist web interface can +be found in + + /usr/share/doc/dcmtk-www/wwwapp.txt + + +For more information please visit the DCMTK homepage and the user forum at + + http://dicom.offis.de/dcmtk.php.en + +and + + http://forum.dcmtk.org/ + + -- Mathieu Malaterre Wed, 15 May 2013 10:34:58 +0200 diff --git a/debian/dcmtk.dirs b/debian/dcmtk.dirs new file mode 100644 index 00000000..716b8d83 --- /dev/null +++ b/debian/dcmtk.dirs @@ -0,0 +1 @@ +/var/lib/dcmtk/db diff --git a/debian/dcmtk.docs b/debian/dcmtk.docs new file mode 100644 index 00000000..89a864ae --- /dev/null +++ b/debian/dcmtk.docs @@ -0,0 +1,3 @@ +FAQ +README +debian/NEWS.Debian diff --git a/debian/dcmtk.examples b/debian/dcmtk.examples new file mode 100644 index 00000000..31511743 --- /dev/null +++ b/debian/dcmtk.examples @@ -0,0 +1,2 @@ +debian/dcmtk/usr/share/dcmtk/wlistdb +debian/dcmtk/usr/share/dcmtk/wlistqry diff --git a/debian/dcmtk.install b/debian/dcmtk.install new file mode 100644 index 00000000..fa3115e4 --- /dev/null +++ b/debian/dcmtk.install @@ -0,0 +1,10 @@ +usr/bin/* +etc/dcmtk/* +usr/share/dcmtk/*.css +usr/share/dcmtk/*.dump +usr/share/dcmtk/*.lut +usr/share/dcmtk/dcm2xml.dtd +usr/share/dcmtk/dsr2xml.xsd +usr/share/dcmtk/dumppat.txt +usr/share/dcmtk/wlistdb +usr/share/dcmtk/wlistqry diff --git a/debian/dcmtk.manpages b/debian/dcmtk.manpages new file mode 100644 index 00000000..d411aa70 --- /dev/null +++ b/debian/dcmtk.manpages @@ -0,0 +1 @@ +doxygen/manpages/man1/*.1 diff --git a/debian/dcmtk.postinst b/debian/dcmtk.postinst new file mode 100644 index 00000000..5f681246 --- /dev/null +++ b/debian/dcmtk.postinst @@ -0,0 +1,69 @@ +#!/bin/sh + +set -e + +# Create dcmtk user and group + +if ! getent passwd dcmtk >/dev/null 2>&1; then + if ! getent group dcmtk > /dev/null 2>&1; then + echo "Adding \`dcmtk' group to system ..." + addgroup --quiet --system dcmtk || true + fi + echo "Adding \`dcmtk' user to system ..." + adduser --quiet --system --ingroup dcmtk --home /var/lib/dcmtk/db \ + --shell /bin/sh --disabled-password dcmtk || true +fi + +# work around possible adduser bug, see #119366 +[ -d /var/lib/dcmtk/db ] || mkdir -p /var/lib/dcmtk/db +chmod 755 /var/lib/dcmtk/db +chown -h -R dcmtk:dcmtk /var/lib/dcmtk/db || true + + +# Handle imagectn -> dcmqrdb transition in (3.5.3 -> 3.5.4) + + +LASTVERSION=3.5.3-5 + +case "$1" in +configure) + if dpkg --compare-versions "$2" le "$LASTVERSION"; then + + if [ -e "/etc/dcmtk/imagectn.cfg" ]; then + echo + echo "Configuration file /etc/dcmtk/imagectn.cfg has been modified by user." + echo "This file will be renamed to /etc/dcmtk/dcmqrscp.cfg." + echo "The package default version can be found in /etc/dcmtk/dcmqrscp.cfg.dpkg-new." + echo + mv -f /etc/dcmtk/dcmqrscp.cfg /etc/dcmtk/dcmqrscp.cfg.dpkg-new + mv -f /etc/dcmtk/imagectn.cfg /etc/dcmtk/dcmqrscp.cfg + fi + + if [ -e "/etc/default/imagectn" ]; then + echo "Configuration file /etc/default/imagectn has been modified by user." + echo "This file will be converted to and replaced by /etc/default/dcmqrscp." + echo "The user's old version can be found in /etc/default/imagectn.dpkg-old." + echo "The package default version can be found in /etc/default/dcmqrscp.dpkg-new." + echo + mv -f /etc/default/imagectn /etc/default/imagectn.dpkg-old + mv -f /etc/default/dcmqrscp /etc/default/dcmqrscp.dpkg-new + sed -e 's/IMAGECTN_ENABLE/DCMQRSCP_ENABLE/g' -e 's/imagectn/dcmqrscp/g' \ + /etc/default/dcmqrscp + fi + + if [ -e "/etc/init.d/imagectn" ]; then + echo "Configuration file /etc/init.d/imagectn has been modified by user." + echo "This file will be replaced by /etc/init.d/dcmqrscp." + echo "The user's old version can be found in /etc/init.d/imagectn.dpkg-old" + echo + mv -f /etc/init.d/imagectn /etc/init.d/imagectn.dpkg-old + fi + # Remove (dangling) symlinks in /etc/rcN.d + update-rc.d imagectn remove >/dev/null + fi +esac + + + +#DEBHELPER# + diff --git a/debian/dcmtk.postrm b/debian/dcmtk.postrm new file mode 100644 index 00000000..7365e3be --- /dev/null +++ b/debian/dcmtk.postrm @@ -0,0 +1,19 @@ +#!/bin/sh + +set -e + +# Remove possible leftovers of imagectn -> dcmqrscp transition + +if [ "$1" = "purge" ] ; then + + if [ -e /etc/default/imagectn.dpkg-old ]; then + rm -f /etc/default/imagectn.dpkg-old + fi + + if [ -e /etc/init.d/imagectn.dpkg-old ]; then + rm -f /etc/init.d/imagectn.dpkg-old + fi +fi + +#DEBHELPER# + diff --git a/debian/dcmtk.preinst b/debian/dcmtk.preinst new file mode 100644 index 00000000..a30dfc5a --- /dev/null +++ b/debian/dcmtk.preinst @@ -0,0 +1,38 @@ +#!/bin/sh -e + +# Prepare to handle imagectn -> dcmqrdb (3.5.3 -> 3.5.4) transition +# without triggering a dpkg question +# # Adapted from http://wiki.debian.org/DpkgConffileHandling + +PKGNAME=dcmtk + +# Remove a no-longer used conffile +rm_conffile() { + CONFFILE="$1" + if [ -e "$CONFFILE" ]; then + md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`" + old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE '{s/ obsolete$//;s/.* //p}\"`" + if [ "$md5sum" != "$old_md5sum" ]; then + echo "Obsolete conffile $CONFFILE has been modified by you." + echo "Saving as $CONFFILE.dpkg-bak ..." + mv -f "$CONFFILE" "$CONFFILE".dpkg-bak + else + echo "Removing obsolete conffile $CONFFILE ..." + rm -f "$CONFFILE" + fi + fi +} + +LASTVERSION=3.5.3-5 + +case "$1" in +install|upgrade) + if dpkg --compare-versions "$2" le "$LASTVERSION"; then + rm_conffile "/etc/dcmtk/imagectn.cfg" + rm_conffile "/etc/default/imagectn" + rm_conffile "/etc/init.d/imagectn" + fi +esac + +#DEBHELPER# + diff --git a/debian/dcmtk.prerm b/debian/dcmtk.prerm new file mode 100644 index 00000000..15e7e018 --- /dev/null +++ b/debian/dcmtk.prerm @@ -0,0 +1,23 @@ +#!/bin/sh +set -e + +# This is in case we upgrade from dcmtk version < 3.5.4 +if [ -x "/etc/init.d/imagectn" ]; then + if which invoke-rc.d ; then + invoke-rc.d --quiet imagectn stop + else + /etc/init.d/imagectn stop + fi +fi + +if [ -x "/etc/init.d/dcmqrscp" ]; then + if which invoke-rc.d ; then + invoke-rc.d --quiet dcmqrscp stop + else + /etc/init.d/dcmqrscp stop + fi +fi + +#DEBHELPER# + +exit 0 diff --git a/debian/libdcmtk-dev.install b/debian/libdcmtk-dev.install new file mode 100644 index 00000000..182f0fac --- /dev/null +++ b/debian/libdcmtk-dev.install @@ -0,0 +1,3 @@ +usr/include/dcmtk/* +usr/lib/*.so +usr/lib/cmake/ diff --git a/debian/libdcmtk5.dirs b/debian/libdcmtk5.dirs new file mode 100644 index 00000000..68457717 --- /dev/null +++ b/debian/libdcmtk5.dirs @@ -0,0 +1 @@ +usr/lib diff --git a/debian/libdcmtk5.install b/debian/libdcmtk5.install new file mode 100644 index 00000000..61345946 --- /dev/null +++ b/debian/libdcmtk5.install @@ -0,0 +1,2 @@ +usr/lib/*.so.* +usr/share/libdcmtk4/*.dic diff --git a/debian/libdcmtk5.lintian-overrides b/debian/libdcmtk5.lintian-overrides new file mode 100644 index 00000000..357598d2 --- /dev/null +++ b/debian/libdcmtk5.lintian-overrides @@ -0,0 +1,5 @@ +# There is more than one library in one package bundles which makes perfectly +# sense in this application but does not enable naming the library package apropriately +libdcmtk5: package-name-doesnt-match-sonames +libdcmtk5: embedded-library +libdcmtk5: no-symbols-control-file diff --git a/debian/patches/0001-Fixed-OFoptional-by-introducing-OFalign.patch b/debian/patches/0001-Fixed-OFoptional-by-introducing-OFalign.patch new file mode 100644 index 00000000..566d4415 --- /dev/null +++ b/debian/patches/0001-Fixed-OFoptional-by-introducing-OFalign.patch @@ -0,0 +1,193 @@ +From 21142a1d3354b5d4e97a2e160221ae391362e8c1 Mon Sep 17 00:00:00 2001 +From: Jan Schlamelcher +Date: Fri, 4 Jul 2014 12:02:51 +0200 +Subject: [PATCH] Fixed OFoptional by introducing OFalign? + +--- + CMake/GenerateDCMTKConfigure.cmake | 29 +++ + CMake/osconfig.h.in | 12 + + config/aclocal.m4 | 41 +++ + config/configure | 60 +++++ + config/configure.in | 2 + + config/include/dcmtk/config/osconfig.h.in | 6 + + ofstd/include/dcmtk/ofstd/ofalign.h | 190 ++++++++++++++ + ofstd/include/dcmtk/ofstd/ofoption.h | 390 +++++++++++++++++++---------- + ofstd/include/dcmtk/ofstd/oftraits.h | 4 +- + ofstd/tests/toption.cc | 8 + + 10 files changed, 610 insertions(+), 132 deletions(-) + create mode 100644 ofstd/include/dcmtk/ofstd/ofalign.h + +--- a/CMake/osconfig.h.in ++++ b/CMake/osconfig.h.in +@@ -1102,4 +1102,16 @@ typedef unsigned long ulong; + /* The path on the Android device that should be used for temporary files */ + #cmakedefine ANDROID_TEMPORARY_FILES_LOCATION "@ANDROID_TEMPORARY_FILES_LOCATION@" + ++/* Define if the compiler supports __alignof__ */ ++#cmakedefine HAVE_GNU_ALIGNOF ++ ++/* Define if the compiler supports __alignof */ ++#cmakedefine HAVE_MS_ALIGNOF ++ ++/* Define if the compiler supports __attribute__(aligned) */ ++#cmakedefine HAVE_ATTRIBUTE_ALIGNED ++ ++/* Define if the compiler supports __declspec(align) */ ++#cmakedefine HAVE_DECLSPEC_ALIGN ++ + #endif /* !OSCONFIG_H*/ +--- a/config/aclocal.m4 ++++ b/config/aclocal.m4 +@@ -1490,6 +1490,47 @@ else + fi + ]) + ++AC_DEFUN([AC_CHECK_ALIGNOF], ++[ ++ AC_MSG_CHECKING([for __alignof__]) ++ AC_LINK_IFELSE( ++ [ ++ AC_LANG_SOURCE( ++ [ ++ int main(){char c[__alignof__(int)];return 0;} ++ ]) ++ ], ++ [dcmtk_have_alignof=[yes]], ++ [dcmtk_have_alignof=[no]] ++ ) ++ if test "$dcmtk_have_alignof" = yes; then ++ AC_MSG_RESULT([yes]) ++ AC_DEFINE($1,[1],[Define if __alignof__ is available]) ++ else ++ AC_MSG_RESULT([no]) ++ fi ++]) ++ ++AC_DEFUN([AC_CHECK_ATTRIBUTE_ALIGNED], ++[ ++ AC_MSG_CHECKING([for __attribute__((aligned))]) ++ AC_LINK_IFELSE( ++ [ ++ AC_LANG_SOURCE( ++ [ ++ int main(){__attribute__((aligned(4))) char c[16];return 0;} ++ ]) ++ ], ++ [dcmtk_have_attribute_aligned=[yes]], ++ [dcmtk_have_attribute_aligned=[no]] ++ ) ++ if test "$dcmtk_have_attribute_aligned" = yes; then ++ AC_MSG_RESULT([yes]) ++ AC_DEFINE($1,[1],[Define if __attribute__((aligned)) is available]) ++ else ++ AC_MSG_RESULT([no]) ++ fi ++]) + + dnl + dnl CHECK_VLA checks if the C Compiler supports variable-length arrays +--- a/config/configure ++++ b/config/configure +@@ -14575,6 +14575,66 @@ $as_echo "no" >&6; } + fi + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __alignof__" >&5 ++$as_echo_n "checking for __alignof__... " >&6; } ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++ ++ int main(){char c__alignof__(int);return 0;} ++ ++ ++_ACEOF ++if ac_fn_cxx_try_link "$LINENO"; then : ++ dcmtk_have_alignof=yes ++else ++ dcmtk_have_alignof=no ++ ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++ if test "$dcmtk_have_alignof" = yes; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ ++$as_echo "#define HAVE_GNU_ALIGNOF 1" >>confdefs.h ++ ++ else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ fi ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __attribute__((aligned))" >&5 ++$as_echo_n "checking for __attribute__((aligned))... " >&6; } ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++ ++ int main(){__attribute__((aligned(4))) char c16;return 0;} ++ ++ ++_ACEOF ++if ac_fn_cxx_try_link "$LINENO"; then : ++ dcmtk_have_attribute_aligned=yes ++else ++ dcmtk_have_attribute_aligned=no ++ ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++ if test "$dcmtk_have_attribute_aligned" = yes; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ ++$as_echo "#define HAVE_ATTRIBUTE_ALIGNED 1" >>confdefs.h ++ ++ else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ fi ++ ++ + CFLAGS="$DEBUGCFLAGS $CFLAGS" + CXXFLAGS="$DEBUGCXXFLAGS $CXXFLAGS" + +--- a/config/include/dcmtk/config/osconfig.h.in ++++ b/config/include/dcmtk/config/osconfig.h.in +@@ -75,6 +75,9 @@ + /* Define if __attribute__((aligned)) is available */ + #undef HAVE_ATTRIBUTE_ALIGNED + ++/* Define if __attribute__((aligned)) is available */ ++#undef HAVE_ATTRIBUTE_ALIGNED ++ + /* Define to 1 if you have the `bcmp' function. */ + #undef HAVE_BCMP + +@@ -263,6 +266,9 @@ + + /* Define if __alignof__ is available */ + #undef HAVE_GNU_ALIGNOF ++ ++/* Define if __alignof__ is available */ ++#undef HAVE_GNU_ALIGNOF + + /* Define to 1 if you have the header file. */ + #undef HAVE_GRP_H +--- a/ofstd/tests/toption.cc ++++ b/ofstd/tests/toption.cc +@@ -15,6 +15,11 @@ OFTEST(ofstd_optional) + + OFoptional o0( 3 ), o1, o2( OFnullopt ); + ++ COUT << OFalignof(OFoptional) << ' ' << sizeof(OFoptional) << OFendl; ++ COUT << OFalignof(OFoptional) << ' ' << sizeof(OFoptional) << OFendl; ++ COUT << OFalignof(OFoptional) << ' ' << sizeof(OFoptional) << OFendl; ++ COUT << OFalignof(long) << ' ' << sizeof(long) << ' ' << OFalignof(OFoptional) << ' ' << sizeof(OFoptional) << OFendl; ++ + OFCHECK( o0 && *o0 == 3 ); + + OFCHECK( !o1 && !o2 ); diff --git a/debian/patches/01_fix_perl_script_path.patch b/debian/patches/01_fix_perl_script_path.patch new file mode 100644 index 00000000..37c3284d --- /dev/null +++ b/debian/patches/01_fix_perl_script_path.patch @@ -0,0 +1,223 @@ +Author: Jürgen Salk +Description: The original maintainer Jürgen Salk applied + a set of patches to the original code. The part which fixes + the path to the perl executable is collected in this patch set. +Forwarded: no + +--- a/dcmwlm/perl/changepw.pl ++++ b/dcmwlm/perl/changepw.pl +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/perl + # + # Copyright (C) 1996-2010, OFFIS e.V. + # All rights reserved. See COPYRIGHT file for details. +--- a/dcmwlm/perl/checkvr.ph ++++ b/dcmwlm/perl/checkvr.ph +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/perl + # + # Copyright (C) 1996-2010, OFFIS e.V. + # All rights reserved. See COPYRIGHT file for details. +--- a/dcmwlm/perl/isocode.ph ++++ b/dcmwlm/perl/isocode.ph +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/perl + # + # Copyright (C) 1996-2010, OFFIS e.V. + # All rights reserved. See COPYRIGHT file for details. +--- a/dcmwlm/perl/layout.ph ++++ b/dcmwlm/perl/layout.ph +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/perl + # + # Copyright (C) 1996-2010, OFFIS e.V. + # All rights reserved. See COPYRIGHT file for details. +--- a/dcmwlm/perl/lock.ph ++++ b/dcmwlm/perl/lock.ph +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/perl + # + # Copyright (C) 1996-2010, OFFIS e.V. + # All rights reserved. See COPYRIGHT file for details. +--- a/dcmwlm/perl/log.ph ++++ b/dcmwlm/perl/log.ph +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/perl + # + # Copyright (C) 1996-2010, OFFIS e.V. + # All rights reserved. See COPYRIGHT file for details. +--- a/dcmwlm/perl/main.pl ++++ b/dcmwlm/perl/main.pl +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/perl + # + # Copyright (C) 1996-2010, OFFIS e.V. + # All rights reserved. See COPYRIGHT file for details. +--- a/dcmwlm/perl/password.ph ++++ b/dcmwlm/perl/password.ph +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/perl + # + # Copyright (C) 1996-2010, OFFIS e.V. + # All rights reserved. See COPYRIGHT file for details. +--- a/dcmwlm/perl/patidel.pl ++++ b/dcmwlm/perl/patidel.pl +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/perl + # + # Copyright (C) 1996-2010, OFFIS e.V. + # All rights reserved. See COPYRIGHT file for details. +--- a/dcmwlm/perl/patiedit.pl ++++ b/dcmwlm/perl/patiedit.pl +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/perl + # + # Copyright (C) 1996-2010, OFFIS e.V. + # All rights reserved. See COPYRIGHT file for details. +--- a/dcmwlm/perl/patient.pl ++++ b/dcmwlm/perl/patient.pl +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/perl + # + # Copyright (C) 1996-2010, OFFIS e.V. + # All rights reserved. See COPYRIGHT file for details. +--- a/dcmwlm/perl/prefs.ph ++++ b/dcmwlm/perl/prefs.ph +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/perl + # + # Copyright (C) 1996-2010, OFFIS e.V. + # All rights reserved. See COPYRIGHT file for details. +--- a/dcmwlm/perl/procdel.pl ++++ b/dcmwlm/perl/procdel.pl +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/perl + # + # Copyright (C) 1996-2010, OFFIS e.V. + # All rights reserved. See COPYRIGHT file for details. +--- a/dcmwlm/perl/procedit.pl ++++ b/dcmwlm/perl/procedit.pl +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/perl + # + # Copyright (C) 1996-2010, OFFIS e.V. + # All rights reserved. See COPYRIGHT file for details. +--- a/dcmwlm/perl/procedur.pl ++++ b/dcmwlm/perl/procedur.pl +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/perl + # + # Copyright (C) 1996-2010, OFFIS e.V. + # All rights reserved. See COPYRIGHT file for details. +--- a/dcmwlm/perl/procstep.pl ++++ b/dcmwlm/perl/procstep.pl +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/perl + # + # Copyright (C) 1996-2010, OFFIS e.V. + # All rights reserved. See COPYRIGHT file for details. +--- a/dcmwlm/perl/prstdel.pl ++++ b/dcmwlm/perl/prstdel.pl +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/perl + # + # Copyright (C) 1996-2010, OFFIS e.V. + # All rights reserved. See COPYRIGHT file for details. +--- a/dcmwlm/perl/prstedit.pl ++++ b/dcmwlm/perl/prstedit.pl +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/perl + # + # Copyright (C) 1996-2010, OFFIS e.V. + # All rights reserved. See COPYRIGHT file for details. +--- a/dcmwlm/perl/statdel.pl ++++ b/dcmwlm/perl/statdel.pl +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/perl + # + # Copyright (C) 1996-2010, OFFIS e.V. + # All rights reserved. See COPYRIGHT file for details. +--- a/dcmwlm/perl/statedit.pl ++++ b/dcmwlm/perl/statedit.pl +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/perl + # + # Copyright (C) 1996-2010, OFFIS e.V. + # All rights reserved. See COPYRIGHT file for details. +--- a/dcmwlm/perl/station.pl ++++ b/dcmwlm/perl/station.pl +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/perl + # + # Copyright (C) 1996-2010, OFFIS e.V. + # All rights reserved. See COPYRIGHT file for details. +--- a/dcmwlm/perl/urldecod.ph ++++ b/dcmwlm/perl/urldecod.ph +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/perl + # + # Copyright & Disclaimer. + # This set of routines may be freely distributed, modified and +--- a/dcmwlm/perl/workdel.pl ++++ b/dcmwlm/perl/workdel.pl +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/perl + # + # Copyright (C) 1996-2010, OFFIS e.V. + # All rights reserved. See COPYRIGHT file for details. +--- a/dcmwlm/perl/workedit.pl ++++ b/dcmwlm/perl/workedit.pl +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/perl + # + # Copyright (C) 1996-2010, OFFIS e.V. + # All rights reserved. See COPYRIGHT file for details. +--- a/dcmwlm/perl/worklist.pl ++++ b/dcmwlm/perl/worklist.pl +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/perl + # + # Copyright (C) 1996-2010, OFFIS e.V. + # All rights reserved. See COPYRIGHT file for details. +--- a/dcmwlm/perl/write.ph ++++ b/dcmwlm/perl/write.ph +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/perl + # + # Copyright (C) 1996-2010, OFFIS e.V. + # All rights reserved. See COPYRIGHT file for details. +@@ -42,7 +42,7 @@ sub write_environment + if (open(outfile, ">@_[0]")) + { + print outfile < +Description: The original maintainer Jürgen Salk applied + a set of patches to the original code. This file contains + changes to C++ code +Forwarded: no + +--- a/dcmqrdb/etc/dcmqrscp.cfg ++++ b/dcmqrdb/etc/dcmqrscp.cfg +@@ -10,6 +10,9 @@ + NetworkTCPPort = 104 + MaxPDUSize = 16384 + MaxAssociations = 16 ++UserName = "dcmtk" ++GroupName = "dcmtk" ++ + # + # UserName = + # GroupName = +@@ -28,12 +31,13 @@ HostTable BEGIN + # NOTE: in the current implementation you cannot substitute an IP address + # for a hostname. + # +-acme1 = (ACME1, acmehost1, 5678) +-acme2 = (ACME2, acmehost2, 5678) +-acmeCTcompany = acme1, acme2 +-united1 = (UNITED1, unitedhost1, 104) +-united2 = (UNITED2, unitedhost2, 104) +-unitedMRcompany = united1, united2 ++# Example: ++#acme1 = (ACME1, acmehost1, 5678) ++#acme2 = (ACME2, acmehost2, 5678) ++#acmeCTcompany = acme1, acme2 ++#united1 = (UNITED1, unitedhost1, 104) ++#united2 = (UNITED2, unitedhost2, 104) ++#unitedMRcompany = united1, united2 + # + HostTable END + +@@ -51,8 +55,9 @@ VendorTable BEGIN + # VendorName = SymbolicName + # The symbolic name should be defined in the HostTable. + # +-"Acme CT Company" = acmeCTcompany +-"United MR Company" = unitedMRcompany ++# Example: ++#"Acme CT Company" = acmeCTcompany ++#"United MR Company" = unitedMRcompany + # + VendorTable END + +@@ -70,8 +75,13 @@ AETable BEGIN + # Entry in HostTable | + # ANY + # +-COMMON /home/dicom/db/COMMON R (200, 1024mb) ANY +-ACME_STORE /home/dicom/db/ACME_STORE RW (9, 1024mb) acmeCTcompany +-UNITED_STORE /home/dicom/db/UNITED_STORE RW (9, 1024mb) unitedMRcompany ++# Example: ++# ++#ACME_STORE /var/lib/dcmtk/db/ACME_STORE RW (9, 1024mb) acmeCTcompany ++#UNITED_STORE /var/lib/dcmtk/db/UNITED_STORE RW (9, 1024mb) unitedMRcompany ++# ++# Uncomment and adjust the following lines for a common r/rw storage area: ++#READWRITE /var/lib/dcmtk/db/READWRITE RW (10, 1024mb) ANY ++#READ /var/lib/dcmtk/db/READ R (200, 1024mb) ANY + # + AETable END +--- a/dcmqrdb/docs/dcmqrcnf.txt ++++ b/dcmqrdb/docs/dcmqrcnf.txt +@@ -44,8 +44,8 @@ Example: + NetworkTCPPort = 104 + MaxPDUSize = 8192 + MaxAssociations = 20 +-UserName = (do not change user) +-GroupName = (do not change group) ++UserName = "dcmtk" ++GroupName = "dcmtk" + + NOTE: You must have root privileges to bind port 104 for DICOM association + requests on Unix/Linux/Posix platforms as this is a privileged port number +--- /dev/null ++++ b/dcmwlm/wlistdb/OFFIS/lockfile +@@ -0,0 +1 @@ ++ diff --git a/debian/patches/07_doxygen.patch b/debian/patches/07_doxygen.patch new file mode 100644 index 00000000..84a4e4d2 --- /dev/null +++ b/debian/patches/07_doxygen.patch @@ -0,0 +1,24 @@ +Description: Use graphviz and prefer SVG output +Author: Mathieu Malaterre +Forwarded: not-needed + +--- a/doxygen/htmldocs.cfg ++++ b/doxygen/htmldocs.cfg +@@ -1611,7 +1611,7 @@ HIDE_UNDOC_RELATIONS = YES + # toolkit from AT&T and Lucent Bell Labs. The other options in this section + # have no effect if this option is set to NO (the default) + +-HAVE_DOT = NO ++HAVE_DOT = YES + + # The DOT_NUM_THREADS specifies the number of dot invocations doxygen is + # allowed to run in parallel. When set to 0 (the default) doxygen will +@@ -1728,7 +1728,7 @@ DIRECTORY_GRAPH = YES + # HTML_FILE_EXTENSION to xhtml in order to make the SVG files + # visible in IE 9+ (other browsers do not have this requirement). + +-DOT_IMAGE_FORMAT = png ++DOT_IMAGE_FORMAT = svg + + # If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to + # enable generation of interactive SVG images that allow zooming and panning. diff --git a/debian/patches/Set-HTML_TIMESTAMP-to-NO.patch b/debian/patches/Set-HTML_TIMESTAMP-to-NO.patch new file mode 100644 index 00000000..3b60b5ab --- /dev/null +++ b/debian/patches/Set-HTML_TIMESTAMP-to-NO.patch @@ -0,0 +1,16 @@ +Author: Maria Valentina Marin +Last-Update: Sat, 27 Jun 2015 13:42:06 UTC +Bug-Debian: http://bugs.debian.org/790133 +Description: Set HTML_TIMESTAMP to NO to make package reproducible + +--- a/doxygen/htmldocs.cfg ++++ b/doxygen/htmldocs.cfg +@@ -943,7 +943,7 @@ HTML_COLORSTYLE_GAMMA = 80 + # page will contain the date and time when the page was generated. Setting + # this to NO can help when comparing the output of multiple runs. + +-HTML_TIMESTAMP = YES ++HTML_TIMESTAMP = NO + + # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML + # documentation will contain sections that can be hidden and shown after the diff --git a/debian/patches/datadic_install.patch b/debian/patches/datadic_install.patch new file mode 100644 index 00000000..95dfe0a8 --- /dev/null +++ b/debian/patches/datadic_install.patch @@ -0,0 +1,12 @@ +Description: Install dict to versioned dir +Author: Mathieu Malaterre +Bug-Debian: http://bugs.debian.org/709123 +Forwarded: no + +--- a/dcmdata/data/CMakeLists.txt ++++ b/dcmdata/data/CMakeLists.txt +@@ -1,2 +1,3 @@ + # declare installation files +-INSTALL(FILES dicom.dic acrnema.dic private.dic diconde.dic dcm2xml.dtd dumppat.txt SC.dump VLP.dump DESTINATION ${DCMTK_INSTALL_DATDIR} COMPONENT data) ++INSTALL(FILES dcm2xml.dtd dumppat.txt SC.dump VLP.dump DESTINATION ${DCMTK_INSTALL_DATDIR} COMPONENT data) ++INSTALL(FILES dicom.dic acrnema.dic private.dic diconde.dic DESTINATION ${DCMTK_INSTALL_DATDIC} COMPONENT data) diff --git a/debian/patches/debian_iconv.patch b/debian/patches/debian_iconv.patch new file mode 100644 index 00000000..c2eae50c --- /dev/null +++ b/debian/patches/debian_iconv.patch @@ -0,0 +1,89 @@ +Description: Upstream needs libiconv and libcharset + Debian does not ship either of them, so instead use + iconv support from eglibc + and use libcharset support from gettext + We removed the tests since iconv does not work +Author: Mathieu Malaterre +Origin: vendor +Bug-Debian: http://bugs.debian.org/701802 +Forwarded: yes + +Index: dcmtk-3.6.1_20131114/CMake/FindICONV.cmake +=================================================================== +--- dcmtk-3.6.1_20131114.orig/CMake/FindICONV.cmake 2013-11-14 15:08:01.000000000 +0100 ++++ dcmtk-3.6.1_20131114/CMake/FindICONV.cmake 2013-11-22 19:56:09.278241875 +0100 +@@ -14,11 +14,12 @@ + MARK_AS_ADVANCED(LIBICONV_INCLUDE_DIR) + + # Look for the library +-SET(LIBICONV_LIBS iconv) +-FIND_LIBRARY(LIBICONV_LIBRARY NAMES ${LIBICONV_LIBS}) +-MARK_AS_ADVANCED(LIBICONV_LIBRARY) ++#SET(LIBICONV_LIBS iconv) ++#FIND_LIBRARY(LIBICONV_LIBRARY NAMES ${LIBICONV_LIBS}) ++#MARK_AS_ADVANCED(LIBICONV_LIBRARY) + +-FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBICONV REQUIRED_VARS LIBICONV_LIBRARY LIBICONV_INCLUDE_DIR) ++#FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBICONV REQUIRED_VARS LIBICONV_LIBRARY LIBICONV_INCLUDE_DIR) ++SET(LIBICONV_FOUND TRUE) + + # Copy the result to output variables + IF(LIBICONV_FOUND) +Index: dcmtk-3.6.1_20131114/CMake/FindCharset.cmake +=================================================================== +--- dcmtk-3.6.1_20131114.orig/CMake/FindCharset.cmake 2013-11-14 15:08:01.000000000 +0100 ++++ dcmtk-3.6.1_20131114/CMake/FindCharset.cmake 2013-11-22 19:56:09.278241875 +0100 +@@ -7,10 +7,14 @@ + INCLUDE(FindPackageHandleStandardArgs) + + # Look for the header file +-FIND_PATH(LIBCHARSET_INCLUDE_DIR NAMES localcharset.h) ++FIND_PATH(LIBCHARSET_INCLUDE_DIR localcharset.h ++/usr/share/gettext/intl/ ++) + MARK_AS_ADVANCED(LIBCHARSET_INCLUDE_DIR) + +-SET(LIBCHARSET_LIBS charset) ++SET(LIBCHARSET_LIBS ++gettextlib ++) + FIND_LIBRARY(LIBCHARSET_LIBRARY NAMES ${LIBCHARSET_LIBS}) + MARK_AS_ADVANCED(LIBCHARSET_LIBRARY) + +Index: dcmtk-3.6.1_20131114/ofstd/libsrc/ofchrenc.cc +=================================================================== +--- dcmtk-3.6.1_20131114.orig/ofstd/libsrc/ofchrenc.cc 2013-11-14 15:08:01.000000000 +0100 ++++ dcmtk-3.6.1_20131114/ofstd/libsrc/ofchrenc.cc 2013-11-22 19:56:09.278241875 +0100 +@@ -28,6 +28,9 @@ + #ifdef WITH_LIBICONV + #include + #include ++// The following #define is important this way it turns on/off iconv support in DCMTK ++// debian/iconv.h does not define this variable ++//#define _LIBICONV_VERSION 0x010E + #endif + + BEGIN_EXTERN_C +@@ -469,6 +472,7 @@ + OFString versionStr = "LIBICONV, Version "; + char buf[10]; + // extract major and minor version number ++ int _libiconv_version = 0; + sprintf(buf, "%i.%i", (_libiconv_version >> 8), (_libiconv_version & 0xff)); + versionStr.append(buf); + return versionStr; +Index: dcmtk-3.6.1_20131114/dcmdata/libsrc/dcspchrs.cc +=================================================================== +--- dcmtk-3.6.1_20131114.orig/dcmdata/libsrc/dcspchrs.cc 2013-11-14 15:08:01.000000000 +0100 ++++ dcmtk-3.6.1_20131114/dcmdata/libsrc/dcspchrs.cc 2013-11-22 19:56:09.278241875 +0100 +@@ -710,8 +710,9 @@ + + OFBool DcmSpecificCharacterSet::isConversionLibraryAvailable() + { ++ return OFFalse; + // just call the appropriate function from the underlying class +- return OFCharacterEncoding::isLibraryAvailable(); ++// return OFCharacterEncoding::isLibraryAvailable(); + } + + diff --git a/debian/patches/dont_export_all_executables.patch b/debian/patches/dont_export_all_executables.patch new file mode 100644 index 00000000..a04c5017 --- /dev/null +++ b/debian/patches/dont_export_all_executables.patch @@ -0,0 +1,25 @@ +Description: Don't add executables to cmake exports + CMake exports are used by other packages that compile + and link against dcmtk. Because Debian moves some of + these executables and also dosn't install the test + executables, this import may fail leading to failure + to configure the according package. +Author: Gert Wollny +Bug-Debian: http://bugs.debian.org/803304 + +--- dcmtk-3.6.1~20150629/CMake/dcmtkMacros.cmake 2015-06-29 10:56:45.000000000 +0200 ++++ dcmtk-3.6.1~20150629.new/CMake/dcmtkMacros.cmake 2015-10-28 17:34:00.561427435 +0100 +@@ -55,11 +55,11 @@ + ENDIF(WIN32 AND NOT MINGW) + + # Collect executable as part of global DCMTK_EXECUTABLE_TARGETS property +- SET_PROPERTY(GLOBAL APPEND PROPERTY DCMTK_EXECUTABLE_TARGETS ${PROGRAM}) ++# SET_PROPERTY(GLOBAL APPEND PROPERTY DCMTK_EXECUTABLE_TARGETS ${PROGRAM}) + + # declare installation files, also export DCMTKTargets.cmake + INSTALL(TARGETS ${PROGRAM} +- EXPORT DCMTKTargets ++# EXPORT DCMTKTargets + COMPONENT bin + DESTINATION ${DCMTK_INSTALL_BINDIR}) + ENDIF(BUILD_APPS) diff --git a/debian/patches/ofstd_markup_6.patch b/debian/patches/ofstd_markup_6.patch new file mode 100644 index 00000000..55300a38 --- /dev/null +++ b/debian/patches/ofstd_markup_6.patch @@ -0,0 +1,24 @@ +From: Joerg Riesmeier +Date: Tue, 26 Nov 2013 17:57:46 +0000 (+0100) +Subject: Fixed issue with test "ofstd_markup_6" (Win32). +X-Git-Url: http://git.dcmtk.org/web?p=dcmtk.git;a=commitdiff_plain;h=94ae6b50c738e64d8cefa8e07a10fc8ddd75418f + +Fixed issue with test "ofstd_markup_6" (Win32). + +Fixed issue with test "ofstd_markup_6" not running successfully on Windows +systems (due to an incorrect length of the input string value). +--- + +Index: dcmtk-3.6.1~20131114/ofstd/tests/tmarkup.cc +=================================================================== +--- dcmtk-3.6.1~20131114.orig/ofstd/tests/tmarkup.cc 2013-12-10 14:55:22.278290390 +0100 ++++ dcmtk-3.6.1~20131114/ofstd/tests/tmarkup.cc 2013-12-10 14:56:31.698289462 +0100 +@@ -114,7 +114,7 @@ + OFTEST(ofstd_markup_6) + { + OFString resultStr; +- const size_t sourceLen = 37; ++ const size_t sourceLen = 34; + // XML: source string contains a NULL byte! + const OFString sourceStr(("This is a test\0, with a NULL byte."), sourceLen); + const OFString markupStr = "This is a test, with a NULL byte."; diff --git a/debian/patches/performance.patch b/debian/patches/performance.patch new file mode 100644 index 00000000..cf73c91c --- /dev/null +++ b/debian/patches/performance.patch @@ -0,0 +1,28 @@ +Author: Sebastien Jodogne +Last-Update: Fri, 15 May 2015 16:39:01 UTC +Bug-Debian: http://bugs.debian.org/785400 +Forwarded-Upstream: yes +Description: Fix a DCMTK performance problem + +--- a/dcmnet/libsrc/dul.cc ++++ b/dcmnet/libsrc/dul.cc +@@ -1833,7 +1833,7 @@ receiveTransportConnectionTCP(PRIVATE_NE + return makeDcmnetCondition(DULC_TCPINITERROR, OF_error, msg.c_str()); + } + #endif +- setTCPBufferLength(sock); ++ //setTCPBufferLength(sock); + + #ifndef DONT_DISABLE_NAGLE_ALGORITHM + /* +--- a/dcmnet/libsrc/dulfsm.cc ++++ b/dcmnet/libsrc/dulfsm.cc +@@ -2421,7 +2421,7 @@ requestAssociationTCP(PRIVATE_NETWORKKEY + return makeDcmnetCondition(DULC_TCPINITERROR, OF_error, msg.c_str()); + } + #endif +- setTCPBufferLength(s); ++ //setTCPBufferLength(s); + + #ifndef DONT_DISABLE_NAGLE_ALGORITHM + /* diff --git a/debian/patches/prefs.patch b/debian/patches/prefs.patch new file mode 100644 index 00000000..23cc31b5 --- /dev/null +++ b/debian/patches/prefs.patch @@ -0,0 +1,25 @@ +Author: Jürgen Salk +Description: The original maintainer Jürgen Salk applied + a set of patches to the original code. The part which fixes + the path to the perl executable is collected in this patch set. +Forwarded: no + +--- a/dcmwlm/perl/prefs.ph ++++ b/dcmwlm/perl/prefs.ph +@@ -28,13 +28,13 @@ + # --------------------- WWW Server Configuration --------------------- + + # RELATIVE path to the WWW script directory, as seen by httpd +-$prefs{'cgi_path'} = '/cgi-bin/worklist'; ++$prefs{'cgi_path'} = '/cgi-bin/dcmtk_wlm'; + + # RELATIVE path to the WWW html directory, as seen by httpd +-$prefs{'html_path'} = '/worklist'; ++$prefs{'html_path'} = '/dcmtk_wlm'; + + # ABSOLUTE path to the data directory +-$prefs{'data_path'} = '/home/www/wl-data'; ++$prefs{'data_path'} = '/var/lib/dcmtk/wl-data'; + + # ------------------ Constants - Please do not change! ------------------ + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 00000000..aca0780f --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,15 @@ +01_fix_perl_script_path.patch +02_dcmtk_3.6.0-1.patch +07_doxygen.patch +prefs.patch +system_charls.patch +datadic_install.patch +#debian_iconv.patch +#spelling.patch +#ofstd_markup_6.patch +#warn_unused_result.patch +0001-Fixed-OFoptional-by-introducing-OFalign.patch +performance.patch +Set-HTML_TIMESTAMP-to-NO.patch +soversion_abi.patch +dont_export_all_executables.patch diff --git a/debian/patches/soversion_abi.patch b/debian/patches/soversion_abi.patch new file mode 100644 index 00000000..3a24e623 --- /dev/null +++ b/debian/patches/soversion_abi.patch @@ -0,0 +1,14 @@ +Description: Add abi-version to library name +Author: Gert Wollny + +--- a/CMake/dcmtkPrepare.cmake 2015-10-28 15:16:05.279429955 +0100 ++++ b/CMake/dcmtkPrepare.cmake 2015-10-28 15:17:11.058822022 +0100 +@@ -56,7 +56,7 @@ + #SET(DCMTK_PACKAGE_URL "http://www.dcmtk.org/") + + # Shared library version information +-SET(DCMTK_LIBRARY_PROPERTIES VERSION "${DCMTK_PACKAGE_VERSION}" SOVERSION "${DCMTK_ABI_VERSION}") ++SET(DCMTK_LIBRARY_PROPERTIES VERSION "${DCMTK_PACKAGE_VERSION}.abi2" SOVERSION "${DCMTK_ABI_VERSION}") + + # General build options and settings + OPTION(BUILD_APPS "Build command line applications and test programs." ON) diff --git a/debian/patches/sparc_align.patch b/debian/patches/sparc_align.patch new file mode 100644 index 00000000..7e5f8e1d --- /dev/null +++ b/debian/patches/sparc_align.patch @@ -0,0 +1,18 @@ +Description: Fix a SIGSEGV on sparc due to alignement issue +Author: Jan Schlamelcher +Origin: upstream +Reviewed-By: Mathieu Malaterre + +--- dcmtk-3.6.1~20140617.orig/ofstd/include/dcmtk/ofstd/ofoption.h ++++ dcmtk-3.6.1~20140617/ofstd/include/dcmtk/ofstd/ofoption.h +@@ -770,8 +770,8 @@ private: + // optimize alignment and so on. Mutable, since the content + // itself can be modified even if it cant be (re-)assigned. + void* content() const { return m_Content; } +- Uint8& state() const { return m_Content[sizeof(T)]; } +- mutable Uint8 m_Content[sizeof(T)+1]; ++ Uint64& state() const { return m_Content[sizeof(T)]; } ++ mutable Uint64 m_Content[sizeof(T)+1]; + #endif // NOT DOXYGEN + }; + diff --git a/debian/patches/spelling.patch b/debian/patches/spelling.patch new file mode 100644 index 00000000..5d08c83d --- /dev/null +++ b/debian/patches/spelling.patch @@ -0,0 +1,815 @@ +Description: spelling error reported by lintian +Author: Mathieu Malaterre +Bug-Debian: http://bugs.debian.org/730635 + +Index: dcmtk-3.6.1~20131114/dcmimage/docs/dcmquant.man +=================================================================== +--- dcmtk-3.6.1~20131114.orig/dcmimage/docs/dcmquant.man 2013-11-27 15:36:37.000000000 +0100 ++++ dcmtk-3.6.1~20131114/dcmimage/docs/dcmquant.man 2013-11-27 15:36:37.000000000 +0100 +@@ -258,7 +258,7 @@ + whitespaces are treated as a single separator unless they appear between two + quotation marks) prior to any further evaluation. Please note that a command + file cannot contain another command file. This simple but effective approach +-allows to summarize common combinations of options/parameters and avoids ++allows one to summarize common combinations of options/parameters and avoids + longish and confusing command lines (an example is provided in file + \/dumppat.txt). + +Index: dcmtk-3.6.1~20131114/dcmimage/docs/dcmscale.man +=================================================================== +--- dcmtk-3.6.1~20131114.orig/dcmimage/docs/dcmscale.man 2013-11-27 15:36:37.000000000 +0100 ++++ dcmtk-3.6.1~20131114/dcmimage/docs/dcmscale.man 2013-11-27 15:36:37.000000000 +0100 +@@ -243,7 +243,7 @@ + whitespaces are treated as a single separator unless they appear between two + quotation marks) prior to any further evaluation. Please note that a command + file cannot contain another command file. This simple but effective approach +-allows to summarize common combinations of options/parameters and avoids ++allows one to summarize common combinations of options/parameters and avoids + longish and confusing command lines (an example is provided in file + \/dumppat.txt). + +Index: dcmtk-3.6.1~20131114/dcmimage/docs/dcm2pnm.man +=================================================================== +--- dcmtk-3.6.1~20131114.orig/dcmimage/docs/dcm2pnm.man 2013-11-27 15:36:37.000000000 +0100 ++++ dcmtk-3.6.1~20131114/dcmimage/docs/dcm2pnm.man 2013-11-27 15:36:37.000000000 +0100 +@@ -464,7 +464,7 @@ + whitespaces are treated as a single separator unless they appear between two + quotation marks) prior to any further evaluation. Please note that a command + file cannot contain another command file. This simple but effective approach +-allows to summarize common combinations of options/parameters and avoids ++allows one to summarize common combinations of options/parameters and avoids + longish and confusing command lines (an example is provided in file + \/dumppat.txt). + +Index: dcmtk-3.6.1~20131114/dcmsign/docs/dcmsign.man +=================================================================== +--- dcmtk-3.6.1~20131114.orig/dcmsign/docs/dcmsign.man 2013-11-27 15:36:37.000000000 +0100 ++++ dcmtk-3.6.1~20131114/dcmsign/docs/dcmsign.man 2013-11-27 15:36:37.000000000 +0100 +@@ -224,7 +224,7 @@ + standard. + + Private Keys are expected in PEM or DER encoding. PEM is recommended (and +-default) because this allows to keep private keys in encrypted form. Command ++default) because this allows one to keep private keys in encrypted form. Command + line options control the behaviour of \b dcmsign when an encrypted PEM key is + opened (see above). In general it is not recommended to specify the encryption + password in the command line because the command line may be visible to other +@@ -306,7 +306,7 @@ + whitespaces are treated as a single separator unless they appear between two + quotation marks) prior to any further evaluation. Please note that a command + file cannot contain another command file. This simple but effective approach +-allows to summarize common combinations of options/parameters and avoids ++allows one to summarize common combinations of options/parameters and avoids + longish and confusing command lines (an example is provided in file + \/dumppat.txt). + +Index: dcmtk-3.6.1~20131114/dcmnet/docs/getscu.man +=================================================================== +--- dcmtk-3.6.1~20131114.orig/dcmnet/docs/getscu.man 2013-11-27 15:36:37.000000000 +0100 ++++ dcmtk-3.6.1~20131114/dcmnet/docs/getscu.man 2013-11-27 15:36:37.000000000 +0100 +@@ -505,7 +505,7 @@ + whitespaces are treated as a single separator unless they appear between two + quotation marks) prior to any further evaluation. Please note that a command + file cannot contain another command file. This simple but effective approach +-allows to summarize common combinations of options/parameters and avoids ++allows one to summarize common combinations of options/parameters and avoids + longish and confusing command lines (an example is provided in file + \/dumppat.txt). + +Index: dcmtk-3.6.1~20131114/dcmnet/docs/dcmsend.man +=================================================================== +--- dcmtk-3.6.1~20131114.orig/dcmnet/docs/dcmsend.man 2013-11-27 15:36:37.000000000 +0100 ++++ dcmtk-3.6.1~20131114/dcmnet/docs/dcmsend.man 2013-11-27 15:36:37.000000000 +0100 +@@ -345,7 +345,7 @@ + whitespaces are treated as a single separator unless they appear between two + quotation marks) prior to any further evaluation. Please note that a command + file cannot contain another command file. This simple but effective approach +-allows to summarize common combinations of options/parameters and avoids ++allows one to summarize common combinations of options/parameters and avoids + longish and confusing command lines (an example is provided in file + \/dumppat.txt). + +Index: dcmtk-3.6.1~20131114/dcmnet/docs/dcmrecv.man +=================================================================== +--- dcmtk-3.6.1~20131114.orig/dcmnet/docs/dcmrecv.man 2013-11-27 15:36:37.000000000 +0100 ++++ dcmtk-3.6.1~20131114/dcmnet/docs/dcmrecv.man 2013-11-27 15:36:37.000000000 +0100 +@@ -292,7 +292,7 @@ + whitespaces are treated as a single separator unless they appear between two + quotation marks) prior to any further evaluation. Please note that a command + file cannot contain another command file. This simple but effective approach +-allows to summarize common combinations of options/parameters and avoids ++allows one to summarize common combinations of options/parameters and avoids + longish and confusing command lines (an example is provided in file + \/dumppat.txt). + +Index: dcmtk-3.6.1~20131114/dcmnet/docs/storescp.man +=================================================================== +--- dcmtk-3.6.1~20131114.orig/dcmnet/docs/storescp.man 2013-11-27 15:36:37.000000000 +0100 ++++ dcmtk-3.6.1~20131114/dcmnet/docs/storescp.man 2013-11-27 15:36:37.000000000 +0100 +@@ -459,7 +459,7 @@ + filenames created by \e --rename-on-eostudy to maintain the length of 8 + characters. + +-Option \e --exec-on-reception allows to execute a certain command line after ++Option \e --exec-on-reception allows one to execute a certain command line after + having received and processed one DICOM object (through a C-STORE-RQ message). + The command line to be executed is passed to this option as a parameter. The + specified command line may contain a number of placeholders which will be +@@ -479,7 +479,7 @@ + execution of \b storescp will not be held back. This behavior can be influenced + with the \e --exec-sync option. + +-Option \e --exec-on-eostudy allows to execute a certain command line when all ++Option \e --exec-on-eostudy allows one to execute a certain command line when all + DICOM objects that belong to one study have been received by \b storescp. + The same placeholders as with \e --exec-on-reception may be used, except for + '\#f', which is not supported. A study is considered complete by \b storescp +@@ -794,7 +794,7 @@ + whitespaces are treated as a single separator unless they appear between two + quotation marks) prior to any further evaluation. Please note that a command + file cannot contain another command file. This simple but effective approach +-allows to summarize common combinations of options/parameters and avoids ++allows one to summarize common combinations of options/parameters and avoids + longish and confusing command lines (an example is provided in file + \/dumppat.txt). + +Index: dcmtk-3.6.1~20131114/dcmnet/docs/termscu.man +=================================================================== +--- dcmtk-3.6.1~20131114.orig/dcmnet/docs/termscu.man 2013-11-27 15:36:37.000000000 +0100 ++++ dcmtk-3.6.1~20131114/dcmnet/docs/termscu.man 2013-11-27 15:36:37.000000000 +0100 +@@ -121,7 +121,7 @@ + whitespaces are treated as a single separator unless they appear between two + quotation marks) prior to any further evaluation. Please note that a command + file cannot contain another command file. This simple but effective approach +-allows to summarize common combinations of options/parameters and avoids ++allows one to summarize common combinations of options/parameters and avoids + longish and confusing command lines (an example is provided in file + \/dumppat.txt). + +Index: dcmtk-3.6.1~20131114/dcmnet/docs/echoscu.man +=================================================================== +--- dcmtk-3.6.1~20131114.orig/dcmnet/docs/echoscu.man 2013-11-27 15:36:37.000000000 +0100 ++++ dcmtk-3.6.1~20131114/dcmnet/docs/echoscu.man 2013-11-27 15:36:37.000000000 +0100 +@@ -220,7 +220,7 @@ + whitespaces are treated as a single separator unless they appear between two + quotation marks) prior to any further evaluation. Please note that a command + file cannot contain another command file. This simple but effective approach +-allows to summarize common combinations of options/parameters and avoids ++allows one to summarize common combinations of options/parameters and avoids + longish and confusing command lines (an example is provided in file + \/dumppat.txt). + +Index: dcmtk-3.6.1~20131114/dcmnet/docs/storescu.man +=================================================================== +--- dcmtk-3.6.1~20131114.orig/dcmnet/docs/storescu.man 2013-11-27 15:36:37.000000000 +0100 ++++ dcmtk-3.6.1~20131114/dcmnet/docs/storescu.man 2013-11-27 15:36:37.000000000 +0100 +@@ -491,7 +491,7 @@ + whitespaces are treated as a single separator unless they appear between two + quotation marks) prior to any further evaluation. Please note that a command + file cannot contain another command file. This simple but effective approach +-allows to summarize common combinations of options/parameters and avoids ++allows one to summarize common combinations of options/parameters and avoids + longish and confusing command lines (an example is provided in file + \/dumppat.txt). + +Index: dcmtk-3.6.1~20131114/dcmnet/docs/findscu.man +=================================================================== +--- dcmtk-3.6.1~20131114.orig/dcmnet/docs/findscu.man 2013-11-27 15:36:37.000000000 +0100 ++++ dcmtk-3.6.1~20131114/dcmnet/docs/findscu.man 2013-11-27 15:36:37.000000000 +0100 +@@ -367,7 +367,7 @@ + whitespaces are treated as a single separator unless they appear between two + quotation marks) prior to any further evaluation. Please note that a command + file cannot contain another command file. This simple but effective approach +-allows to summarize common combinations of options/parameters and avoids ++allows one to summarize common combinations of options/parameters and avoids + longish and confusing command lines (an example is provided in file + \/dumppat.txt). + +Index: dcmtk-3.6.1~20131114/dcmnet/docs/movescu.man +=================================================================== +--- dcmtk-3.6.1~20131114.orig/dcmnet/docs/movescu.man 2013-11-27 15:36:37.000000000 +0100 ++++ dcmtk-3.6.1~20131114/dcmnet/docs/movescu.man 2013-11-27 15:36:37.000000000 +0100 +@@ -656,7 +656,7 @@ + whitespaces are treated as a single separator unless they appear between two + quotation marks) prior to any further evaluation. Please note that a command + file cannot contain another command file. This simple but effective approach +-allows to summarize common combinations of options/parameters and avoids ++allows one to summarize common combinations of options/parameters and avoids + longish and confusing command lines (an example is provided in file + \/dumppat.txt). + +Index: dcmtk-3.6.1~20131114/dcmjpls/docs/dcmcjpls.man +=================================================================== +--- dcmtk-3.6.1~20131114.orig/dcmjpls/docs/dcmcjpls.man 2013-11-27 15:36:37.000000000 +0100 ++++ dcmtk-3.6.1~20131114/dcmjpls/docs/dcmcjpls.man 2013-11-27 15:36:37.000000000 +0100 +@@ -288,7 +288,7 @@ + + The user is responsible for making sure that the compressed images he creates + are compliant with the DICOM standard. If in question, the \b dcmcjpls utility +-allows to convert an image to secondary capture - this SOP class does not pose ++allows one to convert an image to secondary capture - this SOP class does not pose + restrictions as the ones mentioned above. + + \section transfer_syntaxes TRANSFER SYNTAXES +@@ -350,7 +350,7 @@ + whitespaces are treated as a single separator unless they appear between two + quotation marks) prior to any further evaluation. Please note that a command + file cannot contain another command file. This simple but effective approach +-allows to summarize common combinations of options/parameters and avoids ++allows one to summarize common combinations of options/parameters and avoids + longish and confusing command lines (an example is provided in file + \/dumppat.txt). + +Index: dcmtk-3.6.1~20131114/dcmjpls/docs/dcmdjpls.man +=================================================================== +--- dcmtk-3.6.1~20131114.orig/dcmjpls/docs/dcmdjpls.man 2013-11-27 15:36:37.000000000 +0100 ++++ dcmtk-3.6.1~20131114/dcmjpls/docs/dcmdjpls.man 2013-11-27 15:36:37.000000000 +0100 +@@ -69,7 +69,7 @@ + -f --read-dataset + read data set without file meta information + +- # This option allows to decompress JPEG-LS compressed DICOM objects that have ++ # This option allows one to decompress JPEG-LS compressed DICOM objects that have + # been stored as dataset without meta-header. Such a thing should not exist + # since the transfer syntax cannot be reliably determined without meta-header, + # but unfortunately it does. +@@ -249,7 +249,7 @@ + whitespaces are treated as a single separator unless they appear between two + quotation marks) prior to any further evaluation. Please note that a command + file cannot contain another command file. This simple but effective approach +-allows to summarize common combinations of options/parameters and avoids ++allows one to summarize common combinations of options/parameters and avoids + longish and confusing command lines (an example is provided in file + \/dumppat.txt). + +Index: dcmtk-3.6.1~20131114/dcmjpls/docs/dcml2pnm.man +=================================================================== +--- dcmtk-3.6.1~20131114.orig/dcmjpls/docs/dcml2pnm.man 2013-11-27 15:36:37.000000000 +0100 ++++ dcmtk-3.6.1~20131114/dcmjpls/docs/dcml2pnm.man 2013-11-27 15:36:37.000000000 +0100 +@@ -465,7 +465,7 @@ + whitespaces are treated as a single separator unless they appear between two + quotation marks) prior to any further evaluation. Please note that a command + file cannot contain another command file. This simple but effective approach +-allows to summarize common combinations of options/parameters and avoids ++allows one to summarize common combinations of options/parameters and avoids + longish and confusing command lines (an example is provided in file + \/dumppat.txt). + +Index: dcmtk-3.6.1~20131114/dcmsr/docs/dsrdump.man +=================================================================== +--- dcmtk-3.6.1~20131114.orig/dcmsr/docs/dsrdump.man 2013-11-27 15:36:37.000000000 +0100 ++++ dcmtk-3.6.1~20131114/dcmsr/docs/dsrdump.man 2013-11-27 15:36:37.000000000 +0100 +@@ -249,7 +249,7 @@ + whitespaces are treated as a single separator unless they appear between two + quotation marks) prior to any further evaluation. Please note that a command + file cannot contain another command file. This simple but effective approach +-allows to summarize common combinations of options/parameters and avoids ++allows one to summarize common combinations of options/parameters and avoids + longish and confusing command lines (an example is provided in file + \/dumppat.txt). + +Index: dcmtk-3.6.1~20131114/dcmsr/docs/xml2dsr.man +=================================================================== +--- dcmtk-3.6.1~20131114.orig/dcmsr/docs/xml2dsr.man 2013-11-27 15:36:37.000000000 +0100 ++++ dcmtk-3.6.1~20131114/dcmsr/docs/xml2dsr.man 2013-11-27 15:36:37.000000000 +0100 +@@ -271,7 +271,7 @@ + whitespaces are treated as a single separator unless they appear between two + quotation marks) prior to any further evaluation. Please note that a command + file cannot contain another command file. This simple but effective approach +-allows to summarize common combinations of options/parameters and avoids ++allows one to summarize common combinations of options/parameters and avoids + longish and confusing command lines (an example is provided in file + \/dumppat.txt). + +Index: dcmtk-3.6.1~20131114/dcmsr/docs/dsr2html.man +=================================================================== +--- dcmtk-3.6.1~20131114.orig/dcmsr/docs/dsr2html.man 2013-11-27 15:36:37.000000000 +0100 ++++ dcmtk-3.6.1~20131114/dcmsr/docs/dsr2html.man 2013-11-27 15:36:37.000000000 +0100 +@@ -307,7 +307,7 @@ + whitespaces are treated as a single separator unless they appear between two + quotation marks) prior to any further evaluation. Please note that a command + file cannot contain another command file. This simple but effective approach +-allows to summarize common combinations of options/parameters and avoids ++allows one to summarize common combinations of options/parameters and avoids + longish and confusing command lines (an example is provided in file + \/dumppat.txt). + +Index: dcmtk-3.6.1~20131114/dcmsr/docs/dsr2xml.man +=================================================================== +--- dcmtk-3.6.1~20131114.orig/dcmsr/docs/dsr2xml.man 2013-11-27 15:36:37.000000000 +0100 ++++ dcmtk-3.6.1~20131114/dcmsr/docs/dsr2xml.man 2013-11-27 15:36:37.000000000 +0100 +@@ -263,7 +263,7 @@ + whitespaces are treated as a single separator unless they appear between two + quotation marks) prior to any further evaluation. Please note that a command + file cannot contain another command file. This simple but effective approach +-allows to summarize common combinations of options/parameters and avoids ++allows one to summarize common combinations of options/parameters and avoids + longish and confusing command lines (an example is provided in file + \/dumppat.txt). + +Index: dcmtk-3.6.1~20131114/dcmdata/docs/dcmcrle.man +=================================================================== +--- dcmtk-3.6.1~20131114.orig/dcmdata/docs/dcmcrle.man 2013-11-27 15:36:37.000000000 +0100 ++++ dcmtk-3.6.1~20131114/dcmdata/docs/dcmcrle.man 2013-11-27 15:36:37.000000000 +0100 +@@ -221,7 +221,7 @@ + whitespaces are treated as a single separator unless they appear between two + quotation marks) prior to any further evaluation. Please note that a command + file cannot contain another command file. This simple but effective approach +-allows to summarize common combinations of options/parameters and avoids ++allows one to summarize common combinations of options/parameters and avoids + longish and confusing command lines (an example is provided in file + \/dumppat.txt). + +Index: dcmtk-3.6.1~20131114/dcmdata/docs/dcmdrle.man +=================================================================== +--- dcmtk-3.6.1~20131114.orig/dcmdata/docs/dcmdrle.man 2013-11-27 15:36:37.000000000 +0100 ++++ dcmtk-3.6.1~20131114/dcmdata/docs/dcmdrle.man 2013-11-27 15:36:37.000000000 +0100 +@@ -70,7 +70,7 @@ + -f --read-dataset + read data set without file meta information + +- # This option allows to decompress RLE compressed DICOM objects that have ++ # This option allows one to decompress RLE compressed DICOM objects that have + # been stored as dataset without meta-header. Such a thing should not exist + # since the transfer syntax cannot be reliably determined without meta-header, + # but unfortunately it does. +@@ -94,7 +94,7 @@ + +br --byte-order-reverse + least significant byte first + +- # This option allows to decompress RLE compressed DICOM files in which the ++ # This option allows one to decompress RLE compressed DICOM files in which the + # order of byte segments is encoded in incorrect order. This only affects + # images with more than one byte per sample. + \endverbatim +@@ -221,7 +221,7 @@ + whitespaces are treated as a single separator unless they appear between two + quotation marks) prior to any further evaluation. Please note that a command + file cannot contain another command file. This simple but effective approach +-allows to summarize common combinations of options/parameters and avoids ++allows one to summarize common combinations of options/parameters and avoids + longish and confusing command lines (an example is provided in file + \/dumppat.txt). + +Index: dcmtk-3.6.1~20131114/dcmdata/docs/dcmodify.man +=================================================================== +--- dcmtk-3.6.1~20131114.orig/dcmdata/docs/dcmodify.man 2013-11-27 15:36:37.000000000 +0100 ++++ dcmtk-3.6.1~20131114/dcmdata/docs/dcmodify.man 2013-11-27 15:36:37.000000000 +0100 +@@ -14,7 +14,7 @@ + + \section description DESCRIPTION + +-\b dcmodify is a tool that allows to modify, insert and delete tags and items ++\b dcmodify is a tool that allows one to modify, insert and delete tags and items + in DICOM files. Sequences and tags with a value multiplicity > 1 are also + supported. Metaheader information and the tag's VR can not be modified + directly by \b dcmodify at this time. In addition to tag modifications, +@@ -560,7 +560,7 @@ + whitespaces are treated as a single separator unless they appear between two + quotation marks) prior to any further evaluation. Please note that a command + file cannot contain another command file. This simple but effective approach +-allows to summarize common combinations of options/parameters and avoids ++allows one to summarize common combinations of options/parameters and avoids + longish and confusing command lines (an example is provided in file + \/dumppat.txt). + +Index: dcmtk-3.6.1~20131114/dcmdata/docs/pdf2dcm.man +=================================================================== +--- dcmtk-3.6.1~20131114.orig/dcmdata/docs/pdf2dcm.man 2013-11-27 15:36:37.000000000 +0100 ++++ dcmtk-3.6.1~20131114/dcmdata/docs/pdf2dcm.man 2013-11-27 15:36:37.000000000 +0100 +@@ -149,7 +149,7 @@ + whitespaces are treated as a single separator unless they appear between two + quotation marks) prior to any further evaluation. Please note that a command + file cannot contain another command file. This simple but effective approach +-allows to summarize common combinations of options/parameters and avoids ++allows one to summarize common combinations of options/parameters and avoids + longish and confusing command lines (an example is provided in file + \/dumppat.txt). + +Index: dcmtk-3.6.1~20131114/dcmdata/docs/dump2dcm.man +=================================================================== +--- dcmtk-3.6.1~20131114.orig/dcmdata/docs/dump2dcm.man 2013-11-27 15:36:37.000000000 +0100 ++++ dcmtk-3.6.1~20131114/dcmdata/docs/dump2dcm.man 2013-11-27 15:36:37.000000000 +0100 +@@ -286,7 +286,7 @@ + whitespaces are treated as a single separator unless they appear between two + quotation marks) prior to any further evaluation. Please note that a command + file cannot contain another command file. This simple but effective approach +-allows to summarize common combinations of options/parameters and avoids ++allows one to summarize common combinations of options/parameters and avoids + longish and confusing command lines (an example is provided in file + \/dumppat.txt). + +Index: dcmtk-3.6.1~20131114/dcmdata/docs/xml2dcm.man +=================================================================== +--- dcmtk-3.6.1~20131114.orig/dcmdata/docs/xml2dcm.man 2013-11-27 15:36:37.000000000 +0100 ++++ dcmtk-3.6.1~20131114/dcmdata/docs/xml2dcm.man 2013-11-27 15:36:37.000000000 +0100 +@@ -308,7 +308,7 @@ + whitespaces are treated as a single separator unless they appear between two + quotation marks) prior to any further evaluation. Please note that a command + file cannot contain another command file. This simple but effective approach +-allows to summarize common combinations of options/parameters and avoids ++allows one to summarize common combinations of options/parameters and avoids + longish and confusing command lines (an example is provided in file + \/dumppat.txt). + +Index: dcmtk-3.6.1~20131114/dcmdata/docs/dcm2xml.man +=================================================================== +--- dcmtk-3.6.1~20131114.orig/dcmdata/docs/dcm2xml.man 2013-11-27 15:36:37.000000000 +0100 ++++ dcmtk-3.6.1~20131114/dcmdata/docs/dcm2xml.man 2013-11-27 15:36:37.000000000 +0100 +@@ -351,7 +351,7 @@ + whitespaces are treated as a single separator unless they appear between two + quotation marks) prior to any further evaluation. Please note that a command + file cannot contain another command file. This simple but effective approach +-allows to summarize common combinations of options/parameters and avoids ++allows one to summarize common combinations of options/parameters and avoids + longish and confusing command lines (an example is provided in file + \/dumppat.txt). + +Index: dcmtk-3.6.1~20131114/dcmdata/docs/dcmconv.man +=================================================================== +--- dcmtk-3.6.1~20131114.orig/dcmdata/docs/dcmconv.man 2013-11-27 15:36:37.000000000 +0100 ++++ dcmtk-3.6.1~20131114/dcmdata/docs/dcmconv.man 2013-11-27 15:36:37.000000000 +0100 +@@ -332,7 +332,7 @@ + whitespaces are treated as a single separator unless they appear between two + quotation marks) prior to any further evaluation. Please note that a command + file cannot contain another command file. This simple but effective approach +-allows to summarize common combinations of options/parameters and avoids ++allows one to summarize common combinations of options/parameters and avoids + longish and confusing command lines (an example is provided in file + \/dumppat.txt). + +Index: dcmtk-3.6.1~20131114/dcmdata/docs/dcmgpdir.man +=================================================================== +--- dcmtk-3.6.1~20131114.orig/dcmdata/docs/dcmgpdir.man 2013-11-27 15:36:37.000000000 +0100 ++++ dcmtk-3.6.1~20131114/dcmdata/docs/dcmgpdir.man 2013-11-27 15:36:37.000000000 +0100 +@@ -204,7 +204,7 @@ + A \e DICOMDIR file will only be constructed if all files have passed initial + tests. + +-The \b dcmgpdir utility also allows to append new entries to and to update ++The \b dcmgpdir utility also allows one to append new entries to and to update + existing entries in a \e DICOMDIR file. Using option \e +A new entries are + only appended to the DICOMDIR, i.e. existing records like the ones for PATIENT + information are not updated. Using option \e +U also existing records are +@@ -264,7 +264,7 @@ + whitespaces are treated as a single separator unless they appear between two + quotation marks) prior to any further evaluation. Please note that a command + file cannot contain another command file. This simple but effective approach +-allows to summarize common combinations of options/parameters and avoids ++allows one to summarize common combinations of options/parameters and avoids + longish and confusing command lines (an example is provided in file + \/dumppat.txt). + +Index: dcmtk-3.6.1~20131114/dcmdata/docs/dcmdump.man +=================================================================== +--- dcmtk-3.6.1~20131114.orig/dcmdata/docs/dcmdump.man 2013-11-27 15:36:37.000000000 +0100 ++++ dcmtk-3.6.1~20131114/dcmdata/docs/dcmdump.man 2013-11-27 15:36:37.000000000 +0100 +@@ -366,7 +366,7 @@ + whitespaces are treated as a single separator unless they appear between two + quotation marks) prior to any further evaluation. Please note that a command + file cannot contain another command file. This simple but effective approach +-allows to summarize common combinations of options/parameters and avoids ++allows one to summarize common combinations of options/parameters and avoids + longish and confusing command lines (an example is provided in file + \/dumppat.txt). + +Index: dcmtk-3.6.1~20131114/dcmdata/docs/dcm2pdf.man +=================================================================== +--- dcmtk-3.6.1~20131114.orig/dcmdata/docs/dcm2pdf.man 2013-11-27 15:36:37.000000000 +0100 ++++ dcmtk-3.6.1~20131114/dcmdata/docs/dcm2pdf.man 2013-11-27 15:36:37.000000000 +0100 +@@ -180,7 +180,7 @@ + whitespaces are treated as a single separator unless they appear between two + quotation marks) prior to any further evaluation. Please note that a command + file cannot contain another command file. This simple but effective approach +-allows to summarize common combinations of options/parameters and avoids ++allows one to summarize common combinations of options/parameters and avoids + longish and confusing command lines (an example is provided in file + \/dumppat.txt). + +Index: dcmtk-3.6.1~20131114/dcmdata/docs/img2dcm.man +=================================================================== +--- dcmtk-3.6.1~20131114.orig/dcmdata/docs/img2dcm.man 2013-11-27 15:36:37.000000000 +0100 ++++ dcmtk-3.6.1~20131114/dcmdata/docs/img2dcm.man 2013-11-27 15:36:37.000000000 +0100 +@@ -458,7 +458,7 @@ + whitespaces are treated as a single separator unless they appear between two + quotation marks) prior to any further evaluation. Please note that a command + file cannot contain another command file. This simple but effective approach +-allows to summarize common combinations of options/parameters and avoids ++allows one to summarize common combinations of options/parameters and avoids + longish and confusing command lines (an example is provided in file + \/dumppat.txt). + +Index: dcmtk-3.6.1~20131114/dcmimgle/docs/dcmdspfn.man +=================================================================== +--- dcmtk-3.6.1~20131114.orig/dcmimgle/docs/dcmdspfn.man 2013-11-27 15:36:37.000000000 +0100 ++++ dcmtk-3.6.1~20131114/dcmimgle/docs/dcmdspfn.man 2013-11-27 15:36:37.000000000 +0100 +@@ -179,7 +179,7 @@ + whitespaces are treated as a single separator unless they appear between two + quotation marks) prior to any further evaluation. Please note that a command + file cannot contain another command file. This simple but effective approach +-allows to summarize common combinations of options/parameters and avoids ++allows one to summarize common combinations of options/parameters and avoids + longish and confusing command lines (an example is provided in file + \/dumppat.txt). + +Index: dcmtk-3.6.1~20131114/dcmwlm/docs/wlmscpfs.man +=================================================================== +--- dcmtk-3.6.1~20131114.orig/dcmwlm/docs/wlmscpfs.man 2013-11-27 15:36:37.000000000 +0100 ++++ dcmtk-3.6.1~20131114/dcmwlm/docs/wlmscpfs.man 2013-11-27 15:36:37.000000000 +0100 +@@ -417,7 +417,7 @@ + whitespaces are treated as a single separator unless they appear between two + quotation marks) prior to any further evaluation. Please note that a command + file cannot contain another command file. This simple but effective approach +-allows to summarize common combinations of options/parameters and avoids ++allows one to summarize common combinations of options/parameters and avoids + longish and confusing command lines (an example is provided in file + \/dumppat.txt). + +Index: dcmtk-3.6.1~20131114/dcmqrdb/docs/dcmqrti.man +=================================================================== +--- dcmtk-3.6.1~20131114.orig/dcmqrdb/docs/dcmqrti.man 2013-11-27 15:36:37.000000000 +0100 ++++ dcmtk-3.6.1~20131114/dcmqrdb/docs/dcmqrti.man 2013-11-27 15:36:37.000000000 +0100 +@@ -411,7 +411,7 @@ + whitespaces are treated as a single separator unless they appear between two + quotation marks) prior to any further evaluation. Please note that a command + file cannot contain another command file. This simple but effective approach +-allows to summarize common combinations of options/parameters and avoids ++allows one to summarize common combinations of options/parameters and avoids + longish and confusing command lines (an example is provided in file + \/dumppat.txt). + +Index: dcmtk-3.6.1~20131114/dcmqrdb/docs/dcmqrscp.man +=================================================================== +--- dcmtk-3.6.1~20131114.orig/dcmqrdb/docs/dcmqrscp.man 2013-11-27 15:36:37.000000000 +0100 ++++ dcmtk-3.6.1~20131114/dcmqrdb/docs/dcmqrscp.man 2013-11-27 15:36:37.000000000 +0100 +@@ -924,7 +924,7 @@ + whitespaces are treated as a single separator unless they appear between two + quotation marks) prior to any further evaluation. Please note that a command + file cannot contain another command file. This simple but effective approach +-allows to summarize common combinations of options/parameters and avoids ++allows one to summarize common combinations of options/parameters and avoids + longish and confusing command lines (an example is provided in file + \/dumppat.txt). + +Index: dcmtk-3.6.1~20131114/dcmqrdb/docs/dcmqridx.man +=================================================================== +--- dcmtk-3.6.1~20131114.orig/dcmqrdb/docs/dcmqridx.man 2013-11-27 15:36:37.000000000 +0100 ++++ dcmtk-3.6.1~20131114/dcmqrdb/docs/dcmqridx.man 2013-11-27 15:37:07.000000000 +0100 +@@ -14,7 +14,7 @@ + + \section description DESCRIPTION + +-The \b dcmqridx ulility registers DICOM image files in the database index file ++The \b dcmqridx utility registers DICOM image files in the database index file + used by the \b dcmqrscp and \b dcmqrti applications. No image files are copied. + \b dcmqridx can also list the contents of the database index file. + +@@ -105,7 +105,7 @@ + whitespaces are treated as a single separator unless they appear between two + quotation marks) prior to any further evaluation. Please note that a command + file cannot contain another command file. This simple but effective approach +-allows to summarize common combinations of options/parameters and avoids ++allows one to summarize common combinations of options/parameters and avoids + longish and confusing command lines (an example is provided in file + \/dumppat.txt). + +Index: dcmtk-3.6.1~20131114/dcmrt/docs/drtdump.man +=================================================================== +--- dcmtk-3.6.1~20131114.orig/dcmrt/docs/drtdump.man 2013-11-27 15:36:37.000000000 +0100 ++++ dcmtk-3.6.1~20131114/dcmrt/docs/drtdump.man 2013-11-27 15:36:37.000000000 +0100 +@@ -155,7 +155,7 @@ + whitespaces are treated as a single separator unless they appear between two + quotation marks) prior to any further evaluation. Please note that a command + file cannot contain another command file. This simple but effective approach +-allows to summarize common combinations of options/parameters and avoids ++allows one to summarize common combinations of options/parameters and avoids + longish and confusing command lines (an example is provided in file + \/dumppat.txt). + +Index: dcmtk-3.6.1~20131114/dcmjpeg/docs/dcmdjpeg.man +=================================================================== +--- dcmtk-3.6.1~20131114.orig/dcmjpeg/docs/dcmdjpeg.man 2013-11-27 15:36:37.000000000 +0100 ++++ dcmtk-3.6.1~20131114/dcmjpeg/docs/dcmdjpeg.man 2013-11-27 15:36:37.000000000 +0100 +@@ -70,7 +70,7 @@ + -f --read-dataset + read data set without file meta information + +- # This option allows to decompress JPEG compressed DICOM objects that ++ # This option allows one to decompress JPEG compressed DICOM objects that + # have been stored as dataset without meta-header. Such a thing should + # not exist since the transfer syntax cannot be reliably determined, + # without meta-header but unfortunately it does. +@@ -297,7 +297,7 @@ + whitespaces are treated as a single separator unless they appear between two + quotation marks) prior to any further evaluation. Please note that a command + file cannot contain another command file. This simple but effective approach +-allows to summarize common combinations of options/parameters and avoids ++allows one to summarize common combinations of options/parameters and avoids + longish and confusing command lines (an example is provided in file + \/dumppat.txt). + +Index: dcmtk-3.6.1~20131114/dcmjpeg/docs/dcmj2pnm.man +=================================================================== +--- dcmtk-3.6.1~20131114.orig/dcmjpeg/docs/dcmj2pnm.man 2013-11-27 15:36:37.000000000 +0100 ++++ dcmtk-3.6.1~20131114/dcmjpeg/docs/dcmj2pnm.man 2013-11-27 15:36:37.000000000 +0100 +@@ -509,7 +509,7 @@ + whitespaces are treated as a single separator unless they appear between two + quotation marks) prior to any further evaluation. Please note that a command + file cannot contain another command file. This simple but effective approach +-allows to summarize common combinations of options/parameters and avoids ++allows one to summarize common combinations of options/parameters and avoids + longish and confusing command lines (an example is provided in file + \/dumppat.txt). + +Index: dcmtk-3.6.1~20131114/dcmjpeg/docs/dcmcjpeg.man +=================================================================== +--- dcmtk-3.6.1~20131114.orig/dcmjpeg/docs/dcmcjpeg.man 2013-11-27 15:36:37.000000000 +0100 ++++ dcmtk-3.6.1~20131114/dcmjpeg/docs/dcmcjpeg.man 2013-11-27 15:36:37.000000000 +0100 +@@ -546,7 +546,7 @@ + + The user is responsible for making sure that the compressed images he creates + are compliant with the DICOM standard. If in question, the \b dcmcjpeg utility +-allows to convert an image to secondary capture - this SOP class does not pose ++allows one to convert an image to secondary capture - this SOP class does not pose + restrictions as the ones mentioned above. + + With version DCMTK 3.5.4 a new encoder for truely lossless JPEG compression was +@@ -642,7 +642,7 @@ + whitespaces are treated as a single separator unless they appear between two + quotation marks) prior to any further evaluation. Please note that a command + file cannot contain another command file. This simple but effective approach +-allows to summarize common combinations of options/parameters and avoids ++allows one to summarize common combinations of options/parameters and avoids + longish and confusing command lines (an example is provided in file + \/dumppat.txt). + +Index: dcmtk-3.6.1~20131114/dcmjpeg/docs/dcmmkdir.man +=================================================================== +--- dcmtk-3.6.1~20131114.orig/dcmjpeg/docs/dcmmkdir.man 2013-11-27 15:36:37.000000000 +0100 ++++ dcmtk-3.6.1~20131114/dcmjpeg/docs/dcmmkdir.man 2013-11-27 15:36:37.000000000 +0100 +@@ -362,7 +362,7 @@ + A \e DICOMDIR file will only be constructed if all files have passed initial + tests. + +-The \b dcmmkdir utility also allows to append new entries to and to update ++The \b dcmmkdir utility also allows one to append new entries to and to update + existing entries in a \e DICOMDIR file. Using option \e +A new entries are + only appended to the DICOMDIR, i.e. existing records like the ones for PATIENT + information are not updated. Using option \e +U also existing records are +@@ -427,7 +427,7 @@ + whitespaces are treated as a single separator unless they appear between two + quotation marks) prior to any further evaluation. Please note that a command + file cannot contain another command file. This simple but effective approach +-allows to summarize common combinations of options/parameters and avoids ++allows one to summarize common combinations of options/parameters and avoids + longish and confusing command lines (an example is provided in file + \/dumppat.txt). + +Index: dcmtk-3.6.1~20131114/dcmpstat/docs/dcmpsrcv.man +=================================================================== +--- dcmtk-3.6.1~20131114.orig/dcmpstat/docs/dcmpsrcv.man 2013-11-27 15:36:37.000000000 +0100 ++++ dcmtk-3.6.1~20131114/dcmpstat/docs/dcmpsrcv.man 2013-11-27 15:36:37.000000000 +0100 +@@ -100,7 +100,7 @@ + whitespaces are treated as a single separator unless they appear between two + quotation marks) prior to any further evaluation. Please note that a command + file cannot contain another command file. This simple but effective approach +-allows to summarize common combinations of options/parameters and avoids ++allows one to summarize common combinations of options/parameters and avoids + longish and confusing command lines (an example is provided in file + \/dumppat.txt). + +Index: dcmtk-3.6.1~20131114/dcmpstat/docs/dcmpschk.man +=================================================================== +--- dcmtk-3.6.1~20131114.orig/dcmpstat/docs/dcmpschk.man 2013-11-27 15:36:37.000000000 +0100 ++++ dcmtk-3.6.1~20131114/dcmpstat/docs/dcmpschk.man 2013-11-27 15:36:37.000000000 +0100 +@@ -110,7 +110,7 @@ + whitespaces are treated as a single separator unless they appear between two + quotation marks) prior to any further evaluation. Please note that a command + file cannot contain another command file. This simple but effective approach +-allows to summarize common combinations of options/parameters and avoids ++allows one to summarize common combinations of options/parameters and avoids + longish and confusing command lines (an example is provided in file + \/dumppat.txt). + +Index: dcmtk-3.6.1~20131114/dcmpstat/docs/dcmprscu.man +=================================================================== +--- dcmtk-3.6.1~20131114.orig/dcmpstat/docs/dcmprscu.man 2013-11-27 15:36:37.000000000 +0100 ++++ dcmtk-3.6.1~20131114/dcmpstat/docs/dcmprscu.man 2013-11-27 15:36:37.000000000 +0100 +@@ -171,7 +171,7 @@ + whitespaces are treated as a single separator unless they appear between two + quotation marks) prior to any further evaluation. Please note that a command + file cannot contain another command file. This simple but effective approach +-allows to summarize common combinations of options/parameters and avoids ++allows one to summarize common combinations of options/parameters and avoids + longish and confusing command lines (an example is provided in file + \/dumppat.txt). + +Index: dcmtk-3.6.1~20131114/dcmpstat/docs/dcmpssnd.man +=================================================================== +--- dcmtk-3.6.1~20131114.orig/dcmpstat/docs/dcmpssnd.man 2013-11-27 15:36:37.000000000 +0100 ++++ dcmtk-3.6.1~20131114/dcmpstat/docs/dcmpssnd.man 2013-11-27 15:36:37.000000000 +0100 +@@ -108,7 +108,7 @@ + whitespaces are treated as a single separator unless they appear between two + quotation marks) prior to any further evaluation. Please note that a command + file cannot contain another command file. This simple but effective approach +-allows to summarize common combinations of options/parameters and avoids ++allows one to summarize common combinations of options/parameters and avoids + longish and confusing command lines (an example is provided in file + \/dumppat.txt). + +Index: dcmtk-3.6.1~20131114/dcmpstat/docs/dcmpsprt.man +=================================================================== +--- dcmtk-3.6.1~20131114.orig/dcmpstat/docs/dcmpsprt.man 2013-11-27 15:36:37.000000000 +0100 ++++ dcmtk-3.6.1~20131114/dcmpstat/docs/dcmpsprt.man 2013-11-27 15:36:37.000000000 +0100 +@@ -282,7 +282,7 @@ + whitespaces are treated as a single separator unless they appear between two + quotation marks) prior to any further evaluation. Please note that a command + file cannot contain another command file. This simple but effective approach +-allows to summarize common combinations of options/parameters and avoids ++allows one to summarize common combinations of options/parameters and avoids + longish and confusing command lines (an example is provided in file + \/dumppat.txt). + +Index: dcmtk-3.6.1~20131114/dcmpstat/docs/dcmmklut.man +=================================================================== +--- dcmtk-3.6.1~20131114.orig/dcmpstat/docs/dcmmklut.man 2013-11-27 15:36:37.000000000 +0100 ++++ dcmtk-3.6.1~20131114/dcmpstat/docs/dcmmklut.man 2013-11-27 15:36:37.000000000 +0100 +@@ -14,7 +14,7 @@ + + \section description DESCRIPTION + +-The \b dcmmklut utility allows to create a variety of DICOM Modality, ++The \b dcmmklut utility allows one to create a variety of DICOM Modality, + Presentation and VOI look-up tables (LUT) and is intended for the creation + of test images. The utility is able to read an existing DICOM image file, + create a look up table according to the command line options, and write +@@ -222,7 +222,7 @@ + whitespaces are treated as a single separator unless they appear between two + quotation marks) prior to any further evaluation. Please note that a command + file cannot contain another command file. This simple but effective approach +-allows to summarize common combinations of options/parameters and avoids ++allows one to summarize common combinations of options/parameters and avoids + longish and confusing command lines (an example is provided in file + \/dumppat.txt). + +Index: dcmtk-3.6.1~20131114/dcmpstat/docs/dcmprscp.man +=================================================================== +--- dcmtk-3.6.1~20131114.orig/dcmpstat/docs/dcmprscp.man 2013-11-27 15:36:37.000000000 +0100 ++++ dcmtk-3.6.1~20131114/dcmpstat/docs/dcmprscp.man 2013-11-27 15:36:37.000000000 +0100 +@@ -111,7 +111,7 @@ + whitespaces are treated as a single separator unless they appear between two + quotation marks) prior to any further evaluation. Please note that a command + file cannot contain another command file. This simple but effective approach +-allows to summarize common combinations of options/parameters and avoids ++allows one to summarize common combinations of options/parameters and avoids + longish and confusing command lines (an example is provided in file + \/dumppat.txt). + +Index: dcmtk-3.6.1~20131114/dcmpstat/docs/dcmp2pgm.man +=================================================================== +--- dcmtk-3.6.1~20131114.orig/dcmpstat/docs/dcmp2pgm.man 2013-11-27 15:36:37.000000000 +0100 ++++ dcmtk-3.6.1~20131114/dcmpstat/docs/dcmp2pgm.man 2013-11-27 15:36:37.000000000 +0100 +@@ -128,7 +128,7 @@ + whitespaces are treated as a single separator unless they appear between two + quotation marks) prior to any further evaluation. Please note that a command + file cannot contain another command file. This simple but effective approach +-allows to summarize common combinations of options/parameters and avoids ++allows one to summarize common combinations of options/parameters and avoids + longish and confusing command lines (an example is provided in file + \/dumppat.txt). + +Index: dcmtk-3.6.1~20131114/dcmpstat/docs/dcmmkcrv.man +=================================================================== +--- dcmtk-3.6.1~20131114.orig/dcmpstat/docs/dcmmkcrv.man 2013-11-27 15:36:37.000000000 +0100 ++++ dcmtk-3.6.1~20131114/dcmpstat/docs/dcmmkcrv.man 2013-11-27 15:36:37.000000000 +0100 +@@ -14,7 +14,7 @@ + + \section description DESCRIPTION + +-The \b dcmmkcrv utility allows to create DICOM images containing curve data. ++The \b dcmmkcrv utility allows one to create DICOM images containing curve data. + Since curve data is hardly used by vendors today, this is intended as a + means to test implementations that can read curve data. The utility reads an + existing DICOM image and a text file containing the curve data in textual +@@ -156,7 +156,7 @@ + whitespaces are treated as a single separator unless they appear between two + quotation marks) prior to any further evaluation. Please note that a command + file cannot contain another command file. This simple but effective approach +-allows to summarize common combinations of options/parameters and avoids ++allows one to summarize common combinations of options/parameters and avoids + longish and confusing command lines (an example is provided in file + \/dumppat.txt). + +Index: dcmtk-3.6.1~20131114/dcmpstat/docs/dcmpsmk.man +=================================================================== +--- dcmtk-3.6.1~20131114.orig/dcmpstat/docs/dcmpsmk.man 2013-11-27 15:36:37.000000000 +0100 ++++ dcmtk-3.6.1~20131114/dcmpstat/docs/dcmpsmk.man 2013-11-27 15:36:37.000000000 +0100 +@@ -223,7 +223,7 @@ + whitespaces are treated as a single separator unless they appear between two + quotation marks) prior to any further evaluation. Please note that a command + file cannot contain another command file. This simple but effective approach +-allows to summarize common combinations of options/parameters and avoids ++allows one to summarize common combinations of options/parameters and avoids + longish and confusing command lines (an example is provided in file + \/dumppat.txt). + diff --git a/debian/patches/system_charls.patch b/debian/patches/system_charls.patch new file mode 100644 index 00000000..77505cb0 --- /dev/null +++ b/debian/patches/system_charls.patch @@ -0,0 +1,78 @@ +Description: Remove convenient copy of CharLS +Author: Mathieu Malaterre +Bug-Debian: http://bugs.debian.org/705923 +Forwarded: no + +--- a/dcmjpls/CMakeLists.txt ++++ b/dcmjpls/CMakeLists.txt +@@ -2,6 +2,6 @@ + PROJECT(dcmjpls) + + # recurse into subdirectories +-FOREACH(SUBDIR libsrc libcharls apps include) ++FOREACH(SUBDIR libsrc apps include) + ADD_SUBDIRECTORY(${SUBDIR}) + ENDFOREACH(SUBDIR) +--- a/dcmjpls/libsrc/CMakeLists.txt ++++ b/dcmjpls/libsrc/CMakeLists.txt +@@ -1,7 +1,7 @@ + # declare additional include directories +-INCLUDE_DIRECTORIES(${dcmjpls_SOURCE_DIR}/include ${ofstd_SOURCE_DIR}/include ${oflog_SOURCE_DIR}/include ${dcmdata_SOURCE_DIR}/include ${dcmimgle_SOURCE_DIR}/include ${dcmimage_SOURCE_DIR}/include ${dcmjpls_SOURCE_DIR}/libcharls ${ZLIB_INCDIR}) ++INCLUDE_DIRECTORIES(${dcmjpls_SOURCE_DIR}/include ${ofstd_SOURCE_DIR}/include ${oflog_SOURCE_DIR}/include ${dcmdata_SOURCE_DIR}/include ${dcmimgle_SOURCE_DIR}/include ${dcmimage_SOURCE_DIR}/include ${ZLIB_INCDIR}) + + # create library from source files + DCMTK_ADD_LIBRARY(dcmjpls djcparam djdecode djencode djrparam djcodecd djutils djcodece) + +-DCMTK_TARGET_LINK_MODULES(dcmjpls ofstd oflog dcmdata dcmimgle dcmimage charls) ++DCMTK_TARGET_LINK_MODULES(dcmjpls ofstd oflog dcmdata dcmimgle dcmimage CharLS) +--- a/dcmjpls/libsrc/djerror.h ++++ b/dcmjpls/libsrc/djerror.h +@@ -24,7 +24,7 @@ + + #include "dcmtk/config/osconfig.h" + #include "dcmtk/dcmjpls/djlsutil.h" /* For the OFCondition codes */ +-#include "intrface.h" /* CharLS include */ ++#include "CharLS/interface.h" /* CharLS include */ + + /** Helper class for converting between dcmjpls and CharLS error codes + */ +--- a/dcmjpls/libsrc/djcodecd.cc ++++ b/dcmjpls/libsrc/djcodecd.cc +@@ -37,7 +37,7 @@ + #include "djerror.h" /* for private class DJLSError */ + + // JPEG-LS library (CharLS) includes +-#include "intrface.h" ++#include "CharLS/interface.h" + + E_TransferSyntax DJLSLosslessDecoder::supportedTransferSyntax() const + { +--- a/dcmjpls/libsrc/djcodece.cc ++++ b/dcmjpls/libsrc/djcodece.cc +@@ -55,7 +55,7 @@ + #include "dcmtk/dcmimgle/dcmimage.h" /* for class DicomImage */ + + // JPEG-LS library (CharLS) includes +-#include "intrface.h" ++#include "CharLS/interface.h" + + BEGIN_EXTERN_C + #ifdef HAVE_FCNTL_H +--- a/dcmjpls/apps/CMakeLists.txt ++++ b/dcmjpls/apps/CMakeLists.txt +@@ -8,5 +8,5 @@ ENDFOREACH(PROGRAM) + + # make sure executables are linked to the corresponding libraries + FOREACH(PROGRAM dcmcjpls dcmdjpls dcml2pnm) +- DCMTK_TARGET_LINK_MODULES(${PROGRAM} dcmjpls charls dcmimage dcmimgle dcmdata oflog ofstd ofstd) ++ DCMTK_TARGET_LINK_MODULES(${PROGRAM} dcmjpls CharLS dcmimage dcmimgle dcmdata oflog ofstd ofstd) + ENDFOREACH(PROGRAM) +--- a/dcmjpls/libcharls/CMakeLists.txt ++++ b/dcmjpls/libcharls/CMakeLists.txt +@@ -1,5 +1,5 @@ + # declare additional include directories +-INCLUDE_DIRECTORIES(${dcmjpls_SOURCE_DIR}/libcharls ${ofstd_SOURCE_DIR}/include) ++INCLUDE_DIRECTORIES(${ofstd_SOURCE_DIR}/include) + + # create library from source files + DCMTK_ADD_LIBRARY(charls header intrface jpegls) diff --git a/debian/patches/warn_unused_result.patch b/debian/patches/warn_unused_result.patch new file mode 100644 index 00000000..01f22c18 --- /dev/null +++ b/debian/patches/warn_unused_result.patch @@ -0,0 +1,263 @@ +Description: Fix all issues with -Wunused-result + Eg: + dcmqrcnf.cc:294:43: warning: ignoring return value of 'char* fgets(char*, int, + FILE*)', declared with attribute warn_unused_result [-Wunused-result] +Author: Mathieu Malaterre +Bug-Debian: http://bugs.debian.org/731434 +Forwarded: no + +Index: dcmtk-3.6.1~20131114/dcmimage/libsrc/dicoimg.cc +=================================================================== +--- dcmtk-3.6.1~20131114.orig/dcmimage/libsrc/dicoimg.cc 2013-12-10 14:55:18.658290442 +0100 ++++ dcmtk-3.6.1~20131114/dcmimage/libsrc/dicoimg.cc 2013-12-10 14:56:36.194289404 +0100 +@@ -680,8 +680,9 @@ + if ((OutputData != NULL) && (OutputData->getData() != NULL)) + { + fprintf(stream, "P6\n%u %u\n%lu\n", Columns, Rows, DicomImageClass::maxval(bits)); +- fwrite(OutputData->getData(), OFstatic_cast(size_t, OutputData->getCount()), OutputData->getItemSize(), stream); +- return 1; ++ size_t tobewritten = OutputData->getItemSize(); ++ size_t written = fwrite(OutputData->getData(), OFstatic_cast(size_t, OutputData->getCount()), OutputData->getItemSize(), stream); ++ if( written == tobewritten) return 1; + } + } + } +Index: dcmtk-3.6.1~20131114/dcmsign/libsrc/simaccon.cc +=================================================================== +--- dcmtk-3.6.1~20131114.orig/dcmsign/libsrc/simaccon.cc 2013-12-10 14:55:18.634290445 +0100 ++++ dcmtk-3.6.1~20131114/dcmsign/libsrc/simaccon.cc 2013-12-10 14:56:36.194289404 +0100 +@@ -61,8 +61,15 @@ + stream.flushBuffer(bufptr, bufLen); + if (bufLen > 0) + { +- if (dumpFile) fwrite(bufptr, 1, (size_t)bufLen, dumpFile); +- result = mac.digest((unsigned char *)bufptr, (unsigned long)bufLen); ++ size_t written = (size_t)bufLen; ++ if (dumpFile) ++ { ++ written = fwrite(bufptr, 1, (size_t)bufLen, dumpFile); ++ } ++ if( written == (size_t)bufLen ) ++ result = mac.digest((unsigned char *)bufptr, (unsigned long)bufLen); ++ else ++ result = EC_DirectoryNotWritable; + } + return result; + } +Index: dcmtk-3.6.1~20131114/dcmdata/libsrc/dcvrobow.cc +=================================================================== +--- dcmtk-3.6.1~20131114.orig/dcmdata/libsrc/dcvrobow.cc 2013-12-10 14:55:18.686290438 +0100 ++++ dcmtk-3.6.1~20131114/dcmdata/libsrc/dcvrobow.cc 2013-12-10 14:56:36.198289404 +0100 +@@ -214,13 +214,21 @@ + { + swapIfNecessary(EBO_LittleEndian, gLocalByteOrder, data, getLengthField(), sizeof(Uint16)); + setByteOrder(EBO_LittleEndian); +- fwrite(data, sizeof(Uint16), OFstatic_cast(size_t, getLengthField() / sizeof(Uint16)), file); ++ size_t tobewritten = OFstatic_cast(size_t, getLengthField() / sizeof(Uint16)); ++ size_t written = fwrite(data, sizeof(Uint16), tobewritten, file); ++ if( written != tobewritten ) ++ DCMDATA_WARN("DcmOtherByteOtherWord: Some bytes were not written: " << (tobewritten - written) ); + } + } else { + Uint8 *data = NULL; + getUint8Array(data); + if (data != NULL) +- fwrite(data, sizeof(Uint8), OFstatic_cast(size_t, getLengthField()), file); ++ { ++ size_t tobewritten = OFstatic_cast(size_t, getLengthField()); ++ size_t written = fwrite(data, sizeof(Uint8), tobewritten, file); ++ if( written != tobewritten ) ++ DCMDATA_WARN("DcmOtherByteOtherWord: Some bytes were not written: " << (tobewritten - written) ); ++ } + } + fclose(file); + } else { +Index: dcmtk-3.6.1~20131114/dcmimgle/libsrc/diimage.cc +=================================================================== +--- dcmtk-3.6.1~20131114.orig/dcmimgle/libsrc/diimage.cc 2013-12-10 14:55:18.694290443 +0100 ++++ dcmtk-3.6.1~20131114/dcmimgle/libsrc/diimage.cc 2013-12-10 14:56:36.198289404 +0100 +@@ -809,31 +809,40 @@ + swapBytes(OFreinterpret_cast(Uint8 *, palette), 256 * 4 /*byteLength*/, 4 /*valWidth*/); + } + /* write bitmap file header: do not write the struct because of 32-bit alignment */ +- fwrite(&fileHeader.bfType, sizeof(fileHeader.bfType), 1, stream); +- fwrite(&fileHeader.bfSize, sizeof(fileHeader.bfSize), 1, stream); +- fwrite(&fileHeader.bfReserved1, sizeof(fileHeader.bfReserved1), 1, stream); +- fwrite(&fileHeader.bfReserved2, sizeof(fileHeader.bfReserved2), 1, stream); +- fwrite(&fileHeader.bfOffBits, sizeof(fileHeader.bfOffBits), 1, stream); ++ size_t singleitem; // should always be equal to 1 in the following: ++ singleitem = fwrite(&fileHeader.bfType, sizeof(fileHeader.bfType), 1, stream); ++ singleitem = singleitem && fwrite(&fileHeader.bfSize, sizeof(fileHeader.bfSize), 1, stream); ++ singleitem = singleitem && fwrite(&fileHeader.bfReserved1, sizeof(fileHeader.bfReserved1), 1, stream); ++ singleitem = singleitem && fwrite(&fileHeader.bfReserved2, sizeof(fileHeader.bfReserved2), 1, stream); ++ singleitem = singleitem && fwrite(&fileHeader.bfOffBits, sizeof(fileHeader.bfOffBits), 1, stream); + /* write bitmap info header: do not write the struct because of 32-bit alignment */ +- fwrite(&infoHeader.biSize, sizeof(infoHeader.biSize), 1, stream); +- fwrite(&infoHeader.biWidth, sizeof(infoHeader.biWidth), 1, stream); +- fwrite(&infoHeader.biHeight, sizeof(infoHeader.biHeight), 1, stream); +- fwrite(&infoHeader.biPlanes, sizeof(infoHeader.biPlanes), 1, stream); +- fwrite(&infoHeader.biBitCount, sizeof(infoHeader.biBitCount), 1, stream); +- fwrite(&infoHeader.biCompression, sizeof(infoHeader.biCompression), 1, stream); +- fwrite(&infoHeader.biSizeImage, sizeof(infoHeader.biSizeImage), 1, stream); +- fwrite(&infoHeader.biXPelsPerMeter, sizeof(infoHeader.biXPelsPerMeter), 1, stream); +- fwrite(&infoHeader.biYPelsPerMeter, sizeof(infoHeader.biYPelsPerMeter), 1, stream); +- fwrite(&infoHeader.biClrUsed, sizeof(infoHeader.biClrUsed), 1, stream); +- fwrite(&infoHeader.biClrImportant, sizeof(infoHeader.biClrImportant), 1, stream); ++ singleitem = singleitem && fwrite(&infoHeader.biSize, sizeof(infoHeader.biSize), 1, stream); ++ singleitem = singleitem && fwrite(&infoHeader.biWidth, sizeof(infoHeader.biWidth), 1, stream); ++ singleitem = singleitem && fwrite(&infoHeader.biHeight, sizeof(infoHeader.biHeight), 1, stream); ++ singleitem = singleitem && fwrite(&infoHeader.biPlanes, sizeof(infoHeader.biPlanes), 1, stream); ++ singleitem = singleitem && fwrite(&infoHeader.biBitCount, sizeof(infoHeader.biBitCount), 1, stream); ++ singleitem = singleitem && fwrite(&infoHeader.biCompression, sizeof(infoHeader.biCompression), 1, stream); ++ singleitem = singleitem && fwrite(&infoHeader.biSizeImage, sizeof(infoHeader.biSizeImage), 1, stream); ++ singleitem = singleitem && fwrite(&infoHeader.biXPelsPerMeter, sizeof(infoHeader.biXPelsPerMeter), 1, stream); ++ singleitem = singleitem && fwrite(&infoHeader.biYPelsPerMeter, sizeof(infoHeader.biYPelsPerMeter), 1, stream); ++ singleitem = singleitem && fwrite(&infoHeader.biClrUsed, sizeof(infoHeader.biClrUsed), 1, stream); ++ singleitem = singleitem && fwrite(&infoHeader.biClrImportant, sizeof(infoHeader.biClrImportant), 1, stream); + /* write color palette (if applicable) */ +- if (palette != NULL) +- fwrite(palette, 4, 256, stream); ++ if (singleitem && palette != NULL) ++ { ++ size_t paletteitems = fwrite(palette, 4, 256, stream); ++ if( paletteitems != 256 ) singleitem = 0; ++ } + /* write pixel data */ +- fwrite(data, 1, OFstatic_cast(size_t, bytes), stream); ++ if( singleitem ) ++ { ++ size_t pddata = fwrite(data, 1, OFstatic_cast(size_t, bytes), stream); ++ if( pddata != OFstatic_cast(size_t, bytes)) singleitem = 0; ++ } + /* delete color palette */ + delete[] palette; +- result = 1; ++ if( singleitem ) ++ result = 1; + } + /* delete pixel data */ + delete OFstatic_cast(char *, data); // type cast necessary to avoid compiler warnings using gcc >2.95 +Index: dcmtk-3.6.1~20131114/dcmimgle/libsrc/dimoimg.cc +=================================================================== +--- dcmtk-3.6.1~20131114.orig/dcmimgle/libsrc/dimoimg.cc 2013-12-10 14:55:18.706290444 +0100 ++++ dcmtk-3.6.1~20131114/dcmimgle/libsrc/dimoimg.cc 2013-12-10 14:56:36.198289404 +0100 +@@ -2143,9 +2143,10 @@ + fprintf(stream, "P6\n%u %u\n255\n", Columns, Rows); + else + fprintf(stream, "P5\n%u %u\n%lu\n", Columns, Rows, DicomImageClass::maxval(bits)); +- fwrite(OutputData->getData(), OFstatic_cast(size_t, OutputData->getCount()), OutputData->getItemSize(), stream); ++ size_t tobewritten = OutputData->getItemSize(); ++ size_t written = fwrite(OutputData->getData(), OFstatic_cast(size_t, OutputData->getCount()), OutputData->getItemSize(), stream); + deleteOutputData(); +- return 1; ++ if( written == tobewritten ) return 1; + } + } + return 0; +Index: dcmtk-3.6.1~20131114/dcmqrdb/libsrc/dcmqrcnf.cc +=================================================================== +--- dcmtk-3.6.1~20131114.orig/dcmqrdb/libsrc/dcmqrcnf.cc 2013-12-10 14:55:18.674290443 +0100 ++++ dcmtk-3.6.1~20131114/dcmqrdb/libsrc/dcmqrcnf.cc 2013-12-10 14:56:36.198289404 +0100 +@@ -291,7 +291,12 @@ + char *c; + + while (!feof(cnffp)) { +- fgets(rcline, sizeof(rcline), cnffp); /* read line in configuration file */ ++ char *ret = fgets(rcline, sizeof(rcline), cnffp); /* read line in configuration file */ ++ if( !ret ) ++ { ++ error = 1; ++ break; ++ } + lineno++; + if (feof(cnffp)) continue; + if (rcline[0] == '#' || rcline[0] == 10 || rcline[0] == 13) +@@ -413,7 +418,12 @@ + DcmQueryRetrieveConfigHostEntry *helpentry; + + while (!feof(cnffp)) { +- fgets(rcline, sizeof(rcline), cnffp); /* read line in configuration file */ ++ char *ret = fgets(rcline, sizeof(rcline), cnffp); /* read line in configuration file */ ++ if( !ret ) ++ { ++ error = 1; ++ break; ++ } + (*lineno)++; + if (feof(cnffp)) continue; + if (rcline[0] == '#' || rcline[0] == 10 || rcline[0] == 13) +@@ -469,7 +479,12 @@ + DcmQueryRetrieveConfigHostEntry *helpentry; + + while (!feof(cnffp)) { +- fgets(rcline, sizeof(rcline), cnffp); /* read line in configuration file */ ++ char * ret = fgets(rcline, sizeof(rcline), cnffp); /* read line in configuration file */ ++ if( !ret ) ++ { ++ error = 1; ++ break; ++ } + (*lineno)++; + if (feof(cnffp)) continue; + if (rcline[0] == '#' || rcline[0] == 10 || rcline[0] == 13) +@@ -525,7 +540,12 @@ + DcmQueryRetrieveConfigAEEntry *helpentry; + + while (!feof(cnffp)) { +- fgets(rcline, sizeof(rcline), cnffp); /* read line in configuration file */ ++ char * ret = fgets(rcline, sizeof(rcline), cnffp); /* read line in configuration file */ ++ if( !ret ) ++ { ++ error = 1; ++ break; ++ } + (*lineno)++; + if (feof(cnffp)) continue; + if (rcline[0] == '#' || rcline[0] == 10 || rcline[0] == 13) +Index: dcmtk-3.6.1~20131114/dcmqrdb/libsrc/dcmqrdbi.cc +=================================================================== +--- dcmtk-3.6.1~20131114.orig/dcmqrdb/libsrc/dcmqrdbi.cc 2013-12-10 14:55:18.666290445 +0100 ++++ dcmtk-3.6.1~20131114/dcmqrdb/libsrc/dcmqrdbi.cc 2013-12-10 14:56:36.198289404 +0100 +@@ -3416,7 +3416,8 @@ + + record.hstat = DVIF_objectIsNotNew; + DB_lseek(handle_->pidx, OFstatic_cast(long, SIZEOF_STUDYDESC + idx * SIZEOF_IDXRECORD), SEEK_SET); +- write(handle_->pidx, OFreinterpret_cast(char *, &record), SIZEOF_IDXRECORD); ++ ssize_t written = write(handle_->pidx, OFreinterpret_cast(char *, &record), SIZEOF_IDXRECORD); ++ if( written != SIZEOF_IDXRECORD ) result = EC_DirectoryNotWritable; + DB_lseek(handle_->pidx, 0L, SEEK_SET); + DB_unlock(); + } +Index: dcmtk-3.6.1~20131114/dcmpstat/apps/dcmp2pgm.cc +=================================================================== +--- dcmtk-3.6.1~20131114.orig/dcmpstat/apps/dcmp2pgm.cc 2013-12-10 14:55:18.646290441 +0100 ++++ dcmtk-3.6.1~20131114/dcmpstat/apps/dcmp2pgm.cc 2013-12-10 14:56:36.198289404 +0100 +@@ -363,9 +363,12 @@ + if (ofile) + { + fprintf(ofile, "P5\n%d %d 255\n", overlayWidth, overlayHeight); +- fwrite(overlayData, overlayWidth, overlayHeight, ofile); ++ size_t written = fwrite(overlayData, overlayWidth, overlayHeight, ofile); + fclose(ofile); +- oss << " - written." << OFendl; ++ if( written == overlayHeight ) ++ oss << " - written." << OFendl; ++ else ++ oss << " -write error-" << OFendl; + } else oss << " -write error-" << OFendl; + } else { + oss << " unable to access overlay data!" << OFendl; +@@ -546,8 +549,12 @@ + { + OFLOG_DEBUG(dcmp2pgmLogger, "writing PGM file: " << opt_pgmName); + fprintf(outfile, "P5\n%ld %ld 255\n", width, height); +- fwrite(pixelData, (size_t)width, (size_t)height, outfile); ++ size_t written = fwrite(pixelData, (size_t)width, (size_t)height, outfile); + fclose(outfile); ++ if( written != (size_t)height ) { ++ OFLOG_FATAL(dcmp2pgmLogger, "Can't create output data."); ++ return 10; ++ } + } else { + OFLOG_FATAL(dcmp2pgmLogger, "Can't create output file."); + return 10; diff --git a/debian/rules b/debian/rules new file mode 100755 index 00000000..91aa12ad --- /dev/null +++ b/debian/rules @@ -0,0 +1,86 @@ +#!/usr/bin/make -f +#export DH_VERBOSE=1 + +# reduce overlinking: +export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed + +# deduce documentation option (build-indep target) +ifeq "" "$(filter %-doc,$(shell dh_listpackages))" + BUILDDOC = OFF +else + BUILDDOC = ON +endif + +# when BUILDDOC==OFF, convenient copies of doxygen man pages are used +# when BUILDDOC==ON, doxygen man pages are being regenerated, this may leads to +# improper md5sum... + +%: + dh $@ --parallel + +# -DDCMTK_INSTALL_DATDIR:STRING=libdcmtk4 + +override_dh_auto_configure: + cd config && ./autoall && cd .. && \ + ./configure --host=$(DEB_HOST_GNU_TYPE) \ + --build=$(DEB_BUILD_GNU_TYPE) \ + --prefix=/usr \ + --exec-prefix=/usr \ + --mandir=\$${prefix}/share/man \ + --infodir=\$${prefix}/share/info \ + --includedir=\$${prefix}/include \ + --libdir=\$${prefix}/lib \ + --datadir=\$${prefix}/share/libdcmtk2 \ + --sysconfdir=/etc/$(pkg) \ + --with-private-tags \ + --with-libxml \ + --with-libtiff \ + --with-zlib \ + --with-libpng \ + --with-libwrap \ + --with-openssl + +# Let's be smart with building doc +override_dh_auto_build-indep: + $(MAKE) -C obj-* DOXYGEN + +# No tests needed for docs +override_dh_auto_test-indep: + +override_dh_auto_install-arch: + dh_auto_install + # ?? + mv debian/tmp/usr/etc debian/tmp/ + +override_dh_auto_install-indep: + #DESTDIR=debian/tmp $(MAKE) -C obj-*/doxygen install + DESTDIR=$(CURDIR)/debian/tmp $(MAKE) -C obj-*/doxygen install + #rm debian/dcmtk/usr/share/man/man1/_tmp_buildd* + #rm debian/tmp/usr/share/man/man1/_tmp_buildd* + rm debian/tmp/usr/share/man/man1/_*.1 + +override_dh_installdocs: + dh_installdocs + # do the doxygen / jquery fix: + dh_link -pdcmtk-doc usr/share/javascript/jquery/jquery.js usr/share/doc/dcmtk-doc/html/jquery.js + +override_dh_install-arch: + dh_install # --list-missing + chmod +x debian/dcmtk-www/usr/lib/dcmtk/cgi-bin/* + # wotsit ? + rm ./debian/dcmtk/usr/bin/*_tests + rm ./debian/dcmtk/usr/bin/drttest + rm ./debian/dcmtk/usr/bin/mkreport + # fixup + mv ./debian/dcmtk/usr/bin/preplock debian/dcmtk-www/usr/lib/dcmtk/cgi-bin/ + mv ./debian/dcmtk/usr/bin/readoviw debian/dcmtk-www/usr/lib/dcmtk/cgi-bin/ + mv ./debian/dcmtk/usr/bin/readwlst debian/dcmtk-www/usr/lib/dcmtk/cgi-bin/ + mv ./debian/dcmtk/usr/bin/writwlst debian/dcmtk-www/usr/lib/dcmtk/cgi-bin/ + +override_dh_strip: + dh_strip --dbg-package=libdcmtk5-dbg + +get-orig-source: + uscan --force-download --verbose --rename + +.PHONY: get-orig-source diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides new file mode 100644 index 00000000..30ce96df --- /dev/null +++ b/debian/source.lintian-overrides @@ -0,0 +1,3 @@ +# upstream provides two alternates build system: autotools and cmake +# since we pick cmake, no need to take care of this check: +dcmtk: outdated-autotools-helper-file diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 00000000..163aaf8d --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/watch b/debian/watch new file mode 100644 index 00000000..8b6b9f68 --- /dev/null +++ b/debian/watch @@ -0,0 +1,3 @@ +version=3 +opts="uversionmangle=s/_/~/" \ +ftp://dicom.offis.de/pub/dicom/offis/software/dcmtk/snapshot/dcmtk-(.*)\.tar\.gz